Skip to content

Commit 5274d26

Browse files
torvaldstorvalds
committed
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
2 parents 09dcdba + 1c7cfb6 commit 5274d26

16 files changed

Lines changed: 35 additions & 77 deletions

File tree

‎MAINTAINERS‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2157,7 +2157,7 @@ M: Shawn Guo <shawnguo@kernel.org>
21572157
M: Sascha Hauer <s.hauer@pengutronix.de>
21582158
R: Pengutronix Kernel Team <kernel@pengutronix.de>
21592159
R: Fabio Estevam <festevam@gmail.com>
2160-
R: NXP Linux Team <linux-imx@nxp.com>
2160+
L: imx@lists.linux.dev
21612161
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
21622162
S: Maintained
21632163
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@ -8496,7 +8496,7 @@ FREESCALE IMX / MXC FEC DRIVER
84968496
M: Wei Fang <wei.fang@nxp.com>
84978497
R: Shenwei Wang <shenwei.wang@nxp.com>
84988498
R: Clark Wang <xiaoning.wang@nxp.com>
8499-
R: NXP Linux Team <linux-imx@nxp.com>
8499+
L: imx@lists.linux.dev
85008500
L: netdev@vger.kernel.org
85018501
S: Maintained
85028502
F: Documentation/devicetree/bindings/net/fsl,fec.yaml
@@ -8531,7 +8531,7 @@ F: drivers/i2c/busses/i2c-imx.c
85318531
FREESCALE IMX LPI2C DRIVER
85328532
M: Dong Aisheng <aisheng.dong@nxp.com>
85338533
L: linux-i2c@vger.kernel.org
8534-
L: linux-imx@nxp.com
8534+
L: imx@lists.linux.dev
85358535
S: Maintained
85368536
F: Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
85378537
F: drivers/i2c/busses/i2c-imx-lpi2c.c
@@ -15728,7 +15728,7 @@ F: drivers/iio/gyro/fxas21002c_spi.c
1572815728
NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER
1572915729
M: Haibo Chen <haibo.chen@nxp.com>
1573015730
L: linux-iio@vger.kernel.org
15731-
L: linux-imx@nxp.com
15731+
L: imx@lists.linux.dev
1573215732
S: Maintained
1573315733
F: Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml
1573415734
F: Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
@@ -15765,15 +15765,15 @@ F: drivers/gpu/drm/imx/dcss/
1576515765
NXP i.MX 8QXP ADC DRIVER
1576615766
M: Cai Huoqing <cai.huoqing@linux.dev>
1576715767
M: Haibo Chen <haibo.chen@nxp.com>
15768-
L: linux-imx@nxp.com
15768+
L: imx@lists.linux.dev
1576915769
L: linux-iio@vger.kernel.org
1577015770
S: Maintained
1577115771
F: Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
1577215772
F: drivers/iio/adc/imx8qxp-adc.c
1577315773

1577415774
NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
1577515775
M: Mirela Rabulea <mirela.rabulea@nxp.com>
15776-
R: NXP Linux Team <linux-imx@nxp.com>
15776+
L: imx@lists.linux.dev
1577715777
L: linux-media@vger.kernel.org
1577815778
S: Maintained
1577915779
F: Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
@@ -15783,7 +15783,7 @@ NXP i.MX CLOCK DRIVERS
1578315783
M: Abel Vesa <abelvesa@kernel.org>
1578415784
R: Peng Fan <peng.fan@nxp.com>
1578515785
L: linux-clk@vger.kernel.org
15786-
L: linux-imx@nxp.com
15786+
L: imx@lists.linux.dev
1578715787
S: Maintained
1578815788
T: git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
1578915789
F: Documentation/devicetree/bindings/clock/imx*
@@ -19655,7 +19655,7 @@ F: drivers/mmc/host/sdhci-of-at91.c
1965519655

1965619656
SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER
1965719657
M: Haibo Chen <haibo.chen@nxp.com>
19658-
L: linux-imx@nxp.com
19658+
L: imx@lists.linux.dev
1965919659
L: linux-mmc@vger.kernel.org
1966019660
S: Maintained
1966119661
F: drivers/mmc/host/sdhci-esdhc-imx.c

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

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -834,16 +834,6 @@
834834
<&clks IMX7D_LCDIF_PIXEL_ROOT_CLK>;
835835
clock-names = "pix", "axi";
836836
status = "disabled";
837-
838-
port {
839-
#address-cells = <1>;
840-
#size-cells = <0>;
841-
842-
lcdif_out_mipi_dsi: endpoint@0 {
843-
reg = <0>;
844-
remote-endpoint = <&mipi_dsi_in_lcdif>;
845-
};
846-
};
847837
};
848838

849839
mipi_csi: mipi-csi@30750000 {
@@ -895,22 +885,6 @@
895885
samsung,esc-clock-frequency = <20000000>;
896886
samsung,pll-clock-frequency = <24000000>;
897887
status = "disabled";
898-
899-
ports {
900-
#address-cells = <1>;
901-
#size-cells = <0>;
902-
903-
port@0 {
904-
reg = <0>;
905-
#address-cells = <1>;
906-
#size-cells = <0>;
907-
908-
mipi_dsi_in_lcdif: endpoint@0 {
909-
reg = <0>;
910-
remote-endpoint = <&lcdif_out_mipi_dsi>;
911-
};
912-
};
913-
};
914888
};
915889
};
916890

‎arch/arm/configs/imx_v6_v7_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ CONFIG_FB_MODE_HELPERS=y
297297
CONFIG_LCD_CLASS_DEVICE=y
298298
CONFIG_LCD_L4F00242T03=y
299299
CONFIG_LCD_PLATFORM=y
300+
CONFIG_BACKLIGHT_CLASS_DEVICE=y
300301
CONFIG_BACKLIGHT_PWM=y
301302
CONFIG_BACKLIGHT_GPIO=y
302303
CONFIG_FRAMEBUFFER_CONSOLE=y

‎arch/arm64/boot/dts/allwinner/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-cb1-manta.dtb
4242
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-bigtreetech-pi.dtb
4343
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb
4444
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-x96-mate.dtb
45+
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero2w.dtb
4546
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero3.dtb
4647
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-transpeed-8k618-t.dtb

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
<&clk IMX8MP_AUDIO_PLL2_OUT>;
256256
assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;
257257
assigned-clock-rates = <13000000>, <13000000>, <156000000>;
258-
reset-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
258+
reset-gpios = <&gpio4 1 GPIO_ACTIVE_HIGH>;
259259
status = "disabled";
260260

261261
ports {

‎arch/arm64/boot/dts/freescale/imx8mp.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1820,7 +1820,7 @@
18201820
compatible = "fsl,imx8mp-ldb";
18211821
reg = <0x5c 0x4>, <0x128 0x4>;
18221822
reg-names = "ldb", "lvds";
1823-
clocks = <&clk IMX8MP_CLK_MEDIA_LDB>;
1823+
clocks = <&clk IMX8MP_CLK_MEDIA_LDB_ROOT>;
18241824
clock-names = "ldb";
18251825
assigned-clocks = <&clk IMX8MP_CLK_MEDIA_LDB>;
18261826
assigned-clock-parents = <&clk IMX8MP_VIDEO_PLL1_OUT>;

‎arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
status = "okay";
176176

177177
phy-handle = <&mgbe0_phy>;
178-
phy-mode = "usxgmii";
178+
phy-mode = "10gbase-r";
179179

180180
mdio {
181181
#address-cells = <1>;

‎arch/arm64/boot/dts/nvidia/tegra234.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,7 @@
14591459
<&mc TEGRA234_MEMORY_CLIENT_MGBEAWR &emc>;
14601460
interconnect-names = "dma-mem", "write";
14611461
iommus = <&smmu_niso0 TEGRA234_SID_MGBE>;
1462-
power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEA>;
1462+
power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEB>;
14631463
status = "disabled";
14641464
};
14651465

@@ -1493,7 +1493,7 @@
14931493
<&mc TEGRA234_MEMORY_CLIENT_MGBEBWR &emc>;
14941494
interconnect-names = "dma-mem", "write";
14951495
iommus = <&smmu_niso0 TEGRA234_SID_MGBE_VF1>;
1496-
power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEB>;
1496+
power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEC>;
14971497
status = "disabled";
14981498
};
14991499

@@ -1527,7 +1527,7 @@
15271527
<&mc TEGRA234_MEMORY_CLIENT_MGBECWR &emc>;
15281528
interconnect-names = "dma-mem", "write";
15291529
iommus = <&smmu_niso0 TEGRA234_SID_MGBE_VF2>;
1530-
power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEC>;
1530+
power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBED>;
15311531
status = "disabled";
15321532
};
15331533

‎arch/arm64/boot/dts/qcom/msm8996.dtsi‎

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -457,25 +457,6 @@
457457
};
458458
};
459459

460-
mpm: interrupt-controller {
461-
compatible = "qcom,mpm";
462-
qcom,rpm-msg-ram = <&apss_mpm>;
463-
interrupts = <GIC_SPI 171 IRQ_TYPE_EDGE_RISING>;
464-
mboxes = <&apcs_glb 1>;
465-
interrupt-controller;
466-
#interrupt-cells = <2>;
467-
#power-domain-cells = <0>;
468-
interrupt-parent = <&intc>;
469-
qcom,mpm-pin-count = <96>;
470-
qcom,mpm-pin-map = <2 184>, /* TSENS1 upper_lower_int */
471-
<52 243>, /* DWC3_PRI ss_phy_irq */
472-
<79 347>, /* DWC3_PRI hs_phy_irq */
473-
<80 352>, /* DWC3_SEC hs_phy_irq */
474-
<81 347>, /* QUSB2_PHY_PRI DP+DM */
475-
<82 352>, /* QUSB2_PHY_SEC DP+DM */
476-
<87 326>; /* SPMI */
477-
};
478-
479460
psci {
480461
compatible = "arm,psci-1.0";
481462
method = "smc";
@@ -765,15 +746,8 @@
765746
};
766747

767748
rpm_msg_ram: sram@68000 {
768-
compatible = "qcom,rpm-msg-ram", "mmio-sram";
749+
compatible = "qcom,rpm-msg-ram";
769750
reg = <0x00068000 0x6000>;
770-
#address-cells = <1>;
771-
#size-cells = <1>;
772-
ranges = <0 0x00068000 0x7000>;
773-
774-
apss_mpm: sram@1b8 {
775-
reg = <0x1b8 0x48>;
776-
};
777751
};
778752

779753
qfprom@74000 {
@@ -856,8 +830,8 @@
856830
reg = <0x004ad000 0x1000>, /* TM */
857831
<0x004ac000 0x1000>; /* SROT */
858832
#qcom,sensors = <8>;
859-
interrupts-extended = <&mpm 2 IRQ_TYPE_LEVEL_HIGH>,
860-
<&intc GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>;
833+
interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>,
834+
<GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH>;
861835
interrupt-names = "uplow", "critical";
862836
#thermal-sensor-cells = <1>;
863837
};
@@ -1363,7 +1337,6 @@
13631337
interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
13641338
gpio-controller;
13651339
gpio-ranges = <&tlmm 0 0 150>;
1366-
wakeup-parent = <&mpm>;
13671340
#gpio-cells = <2>;
13681341
interrupt-controller;
13691342
#interrupt-cells = <2>;
@@ -1891,7 +1864,7 @@
18911864
<0x0400a000 0x002100>;
18921865
reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
18931866
interrupt-names = "periph_irq";
1894-
interrupts-extended = <&mpm 87 IRQ_TYPE_LEVEL_HIGH>;
1867+
interrupts = <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>;
18951868
qcom,ee = <0>;
18961869
qcom,channel = <0>;
18971870
#address-cells = <2>;
@@ -3052,8 +3025,8 @@
30523025
#size-cells = <1>;
30533026
ranges;
30543027

3055-
interrupts-extended = <&mpm 79 IRQ_TYPE_LEVEL_HIGH>,
3056-
<&mpm 52 IRQ_TYPE_LEVEL_HIGH>;
3028+
interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
3029+
<GIC_SPI 243 IRQ_TYPE_LEVEL_HIGH>;
30573030
interrupt-names = "hs_phy_irq", "ss_phy_irq";
30583031

30593032
clocks = <&gcc GCC_SYS_NOC_USB3_AXI_CLK>,

‎arch/arm64/boot/dts/qcom/sc8280xp-crd.dts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,8 @@
563563
};
564564

565565
&pcie4 {
566+
max-link-speed = <2>;
567+
566568
perst-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>;
567569
wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>;
568570

0 commit comments

Comments
 (0)