Commit 5274d261 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-fixes-6.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "These should be the final fixes for the soc tree for 6.8, as usual
  they mostly deal wtih dts files:

   - Qualcomm fixes for pcie4 on sc8280xp, a revert of msm8996 mpm
     support, sm6115 interconnect and sm8650 gpio.

   - Two fixes for Tegra234 ethernet

   - A Makefile fix to actually build the allwinner based orange pi zero
     2w device tree

   - Fixes for clocks and reset on imx8mp and a DSI display regression
     on imx7.

  The non-DT fixes are:

   - Firmware fixes addressing a kernel panic in op-tee and a minor
     regression in microchip/riscv.

   - A defconfig change to bring back backlight support after a Kconfig
     change"

* tag 'arm-fixes-6.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  firmware: microchip: Fix over-requested allocation size
  tee: optee: Fix kernel panic caused by incorrect error handling
  Revert "arm64: dts: qcom: msm8996: Hook up MPM"
  arm64: dts: qcom: sc8280xp-x13s: limit pcie4 link speed
  arm64: dts: qcom: sc8280xp-crd: limit pcie4 link speed
  arm64: dts: imx8mp: Fix LDB clocks property
  arm64: dts: imx8mp: Fix TC9595 reset GPIO on DH i.MX8M Plus DHCOM SoM
  MAINTAINERS: Use a proper mailinglist for NXP i.MX development
  ARM: dts: imx7: remove DSI port endpoints
  arm64: dts: allwinner: h616: Add Orange Pi Zero 2W to Makefile
  ARM: imx_v6_v7_defconfig: Restore CONFIG_BACKLIGHT_CLASS_DEVICE
  arm64: tegra: Fix Tegra234 MGBE power-domains
  arm64: tegra: Set the correct PHY mode for MGBE
  arm64: dts: qcom: sm6115: Fix missing interconnect-names
  arm64: dts: qcom: sm8650-mtp: add gpio74 as reserved gpio
  arm64: dts: qcom: sm8650-qrd: add gpio74 as reserved gpio
parents 09dcdbac 1c7cfb61

MAINTAINERS

+8 −8
Original line number Diff line number Diff line
@@ -2157,7 +2157,7 @@ M: Shawn Guo <shawnguo@kernel.org> 
M:	Sascha Hauer <s.hauer@pengutronix.de>

R:	Pengutronix Kernel Team <kernel@pengutronix.de>

R:	Fabio Estevam <festevam@gmail.com>

R:	NXP Linux Team <linux-imx@nxp.com>

L:	imx@lists.linux.dev

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@ -8496,7 +8496,7 @@ FREESCALE IMX / MXC FEC DRIVER 
M:	Wei Fang <wei.fang@nxp.com>

R:	Shenwei Wang <shenwei.wang@nxp.com>

R:	Clark Wang <xiaoning.wang@nxp.com>

R:	NXP Linux Team <linux-imx@nxp.com>

L:	imx@lists.linux.dev

L:	netdev@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/net/fsl,fec.yaml
@@ -8531,7 +8531,7 @@ F: drivers/i2c/busses/i2c-imx.c 
FREESCALE IMX LPI2C DRIVER

M:	Dong Aisheng <aisheng.dong@nxp.com>

L:	linux-i2c@vger.kernel.org

L:	linux-imx@nxp.com

L:	imx@lists.linux.dev

S:	Maintained

F:	Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml

F:	drivers/i2c/busses/i2c-imx-lpi2c.c
@@ -15728,7 +15728,7 @@ F: drivers/iio/gyro/fxas21002c_spi.c 
NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER

M:	Haibo Chen <haibo.chen@nxp.com>

L:	linux-iio@vger.kernel.org

L:	linux-imx@nxp.com

L:	imx@lists.linux.dev

S:	Maintained

F:	Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml

F:	Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
@@ -15765,7 +15765,7 @@ F: drivers/gpu/drm/imx/dcss/ 
NXP i.MX 8QXP ADC DRIVER

M:	Cai Huoqing <cai.huoqing@linux.dev>

M:	Haibo Chen <haibo.chen@nxp.com>

L:	linux-imx@nxp.com

L:	imx@lists.linux.dev

L:	linux-iio@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
@@ -15773,7 +15773,7 @@ F: drivers/iio/adc/imx8qxp-adc.c 








NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER









M:	Mirela Rabulea <mirela.rabulea@nxp.com>









R:	NXP Linux Team <linux-imx@nxp.com>









L:	imx@lists.linux.dev









L:	linux-media@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml








@@ -15783,7 +15783,7 @@ NXP i.MX CLOCK DRIVERS







M:	Abel Vesa <abelvesa@kernel.org>









R:	Peng Fan <peng.fan@nxp.com>









L:	linux-clk@vger.kernel.org









L:	linux-imx@nxp.com









L:	imx@lists.linux.dev









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx









F:	Documentation/devicetree/bindings/clock/imx*








@@ -19655,7 +19655,7 @@ F:	drivers/mmc/host/sdhci-of-at91.c















SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER









M:	Haibo Chen <haibo.chen@nxp.com>









L:	linux-imx@nxp.com









L:	imx@lists.linux.dev









L:	linux-mmc@vger.kernel.org









S:	Maintained









F:	drivers/mmc/host/sdhci-esdhc-imx.c

























arch/arm/boot/dts/nxp/imx/imx7s.dtsi



+0
−26






























Original line number
Diff line number
Diff line







@@ -834,16 +834,6 @@ lcdif: lcdif@30730000 {







					<&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>;









				clock-names = "pix", "axi";









				status = "disabled";



















				port {









					#address-cells = <1>;









					#size-cells = <0>;



















					lcdif_out_mipi_dsi: endpoint@0 {









						reg = <0>;









						remote-endpoint = <&mipi_dsi_in_lcdif>;









					};









				};









			};



















			mipi_csi: mipi-csi@30750000 {








@@ -895,22 +885,6 @@ mipi_dsi: dsi@30760000 {







				samsung,esc-clock-frequency = <20000000>;









				samsung,pll-clock-frequency = <24000000>;









				status = "disabled";



















				ports {









					#address-cells = <1>;









					#size-cells = <0>;



















					port@0 {









						reg = <0>;









						#address-cells = <1>;









						#size-cells = <0>;



















						mipi_dsi_in_lcdif: endpoint@0 {









							reg = <0>;









							remote-endpoint = <&lcdif_out_mipi_dsi>;









						};









					};









				};









			};









		};










































arch/arm/configs/imx_v6_v7_defconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -297,6 +297,7 @@ CONFIG_FB_MODE_HELPERS=y







CONFIG_LCD_CLASS_DEVICE=y









CONFIG_LCD_L4F00242T03=y









CONFIG_LCD_PLATFORM=y









CONFIG_BACKLIGHT_CLASS_DEVICE=y









CONFIG_BACKLIGHT_PWM=y









CONFIG_BACKLIGHT_GPIO=y









CONFIG_FRAMEBUFFER_CONSOLE=y
































arch/arm64/boot/dts/allwinner/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -42,5 +42,6 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-manta.dtb







dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-pi.dtb









dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb









dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-x96-mate.dtb









dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero2w.dtb









dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero3.dtb









dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-transpeed-8k618-t.dtb
























arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi



+1
−1






























Original line number
Diff line number
Diff line







@@ -255,7 +255,7 @@ tc_bridge: bridge@f {







				  <&clk IMX8MP_AUDIO_PLL2_OUT>;









		assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;









		assigned-clock-rates = <13000000>, <13000000>, <156000000>;









		reset-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;









		reset-gpios = <&gpio4 1 GPIO_ACTIVE_HIGH>;









		status = "disabled";



















		ports {