Skip to content

Commit 42c78a5

Browse files
committed
Merge tag 'soc-fixes-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "The majority of bugfixes is once more for the NXP i.MX platform, addressing issue with i.MX8M (UART, watchdog and ethernet) as well as imx8dxl power button and the USB modem on an imx7 board. The reason that i.MX always shows up here is obviously not that they are more buggy than the others, but they have the most boards and are good about getting fixes in quickly. The other DT fixes are for the Nuvoton wpcm450 flash controller and the i2c mux on an ASpeed board. Lastly, there are updates to the MAINTAINERS entries for Mediatek, AMD/Seattle and NXP SoCs, as well as a lone code fix for error handling in the allwinner 'rsb' bus driver" * tag 'soc-fixes-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: dts: wpcm450: Add nuvoton,shm = <&shm> to FIU node MAINTAINERS: Update entry for MediaTek SoC support MAINTAINERS: amd: drop inactive Brijesh Singh ARM: dts: imx7d-smegw01: Fix USB host over-current polarity arm64: dts: imx8mm-verdin: Do not power down eth-phy MAINTAINERS: match freescale ARM64 DT directory in i.MX entry arm64: dts: imx8mm: Fix pad control for UART1_DTE_RX ARM: dts: aspeed: Fix pca9849 compatible arm64: dts: freescale: imx8dxl: fix sc_pwrkey's property name linux,keycode arm64: dts: imx8m-venice: Remove incorrect 'uart-has-rtscts' arm64: dts: imx8mm: Reinstate GPIO watchdog always-running property on eDM SBC bus: sunxi-rsb: Fix error handling in sunxi_rsb_init()
2 parents addfba1 + 5efb648 commit 42c78a5

17 files changed

+23
-20
lines changed

MAINTAINERS

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,7 +1097,6 @@ S: Maintained
10971097
F: drivers/dma/ptdma/
10981098

10991099
AMD SEATTLE DEVICE TREE SUPPORT
1100-
M: Brijesh Singh <[email protected]>
11011100
M: Suravee Suthikulpanit <[email protected]>
11021101
M: Tom Lendacky <[email protected]>
11031102
S: Supported
@@ -2212,6 +2211,9 @@ L: [email protected] (moderated for non-subscribers)
22122211
S: Maintained
22132212
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
22142213
X: drivers/media/i2c/
2214+
F: arch/arm64/boot/dts/freescale/
2215+
X: arch/arm64/boot/dts/freescale/fsl-*
2216+
X: arch/arm64/boot/dts/freescale/qoriq-*
22152217
N: imx
22162218
N: mxs
22172219

@@ -2450,19 +2452,22 @@ F: drivers/rtc/rtc-mt7622.c
24502452

24512453
ARM/Mediatek SoC support
24522454
M: Matthias Brugger <[email protected]>
2455+
R: AngeloGioacchino Del Regno <[email protected]>
2456+
24532457
L: [email protected] (moderated for non-subscribers)
24542458
L: [email protected] (moderated for non-subscribers)
24552459
S: Maintained
24562460
W: https://mtk.wiki.kernel.org/
2457-
C: irc://chat.freenode.net/linux-mediatek
2461+
C: irc://irc.libera.chat/linux-mediatek
2462+
F: arch/arm/boot/dts/mt2*
24582463
F: arch/arm/boot/dts/mt6*
24592464
F: arch/arm/boot/dts/mt7*
24602465
F: arch/arm/boot/dts/mt8*
24612466
F: arch/arm/mach-mediatek/
24622467
F: arch/arm64/boot/dts/mediatek/
24632468
F: drivers/soc/mediatek/
24642469
N: mtk
2465-
N: mt[678]
2470+
N: mt[2678]
24662471
K: mediatek
24672472

24682473
ARM/Mediatek USB3 PHY DRIVER

arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@
751751
};
752752

753753
pca9849@75 {
754-
compatible = "nxp,pca849";
754+
compatible = "nxp,pca9849";
755755
reg = <0x75>;
756756
#address-cells = <1>;
757757
#size-cells = <0>;

arch/arm/boot/dts/imx7d-smegw01.dts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@
198198
&usbotg2 {
199199
pinctrl-names = "default";
200200
pinctrl-0 = <&pinctrl_usbotg2>;
201+
over-current-active-low;
201202
dr_mode = "host";
202203
status = "okay";
203204
};
@@ -374,7 +375,7 @@
374375

375376
pinctrl_usbotg2: usbotg2grp {
376377
fsl,pins = <
377-
MX7D_PAD_UART3_RTS_B__USB_OTG2_OC 0x04
378+
MX7D_PAD_UART3_RTS_B__USB_OTG2_OC 0x5c
378379
>;
379380
};
380381

arch/arm/boot/dts/nuvoton-wpcm450.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@
480480
reg = <0xc8000000 0x1000>, <0xc0000000 0x4000000>;
481481
reg-names = "control", "memory";
482482
clocks = <&clk 0>;
483+
nuvoton,shm = <&shm>;
483484
status = "disabled";
484485
};
485486

arch/arm64/boot/dts/freescale/imx8dxl.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164

165165
sc_pwrkey: keys {
166166
compatible = "fsl,imx8qxp-sc-key", "fsl,imx-sc-key";
167-
linux,keycode = <KEY_POWER>;
167+
linux,keycodes = <KEY_POWER>;
168168
wakeup-source;
169169
};
170170

arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
pinctrl-names = "default";
8989
pinctrl-0 = <&pinctrl_watchdog_gpio>;
9090
compatible = "linux,wdt-gpio";
91+
always-running;
9192
gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
9293
hw_algo = "level";
9394
/* Reset triggers in 2..3 seconds */

arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@
602602
#define MX8MM_IOMUXC_UART1_RXD_GPIO5_IO22 0x234 0x49C 0x000 0x5 0x0
603603
#define MX8MM_IOMUXC_UART1_RXD_TPSMP_HDATA24 0x234 0x49C 0x000 0x7 0x0
604604
#define MX8MM_IOMUXC_UART1_TXD_UART1_DCE_TX 0x238 0x4A0 0x000 0x0 0x0
605-
#define MX8MM_IOMUXC_UART1_TXD_UART1_DTE_RX 0x238 0x4A0 0x4F4 0x0 0x0
605+
#define MX8MM_IOMUXC_UART1_TXD_UART1_DTE_RX 0x238 0x4A0 0x4F4 0x0 0x1
606606
#define MX8MM_IOMUXC_UART1_TXD_ECSPI3_MOSI 0x238 0x4A0 0x000 0x1 0x0
607607
#define MX8MM_IOMUXC_UART1_TXD_GPIO5_IO23 0x238 0x4A0 0x000 0x5 0x0
608608
#define MX8MM_IOMUXC_UART1_TXD_TPSMP_HDATA25 0x238 0x4A0 0x000 0x7 0x0

arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x-rs232-rts.dtso

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
pinctrl-0 = <&pinctrl_uart2>;
3434
rts-gpios = <&gpio5 29 GPIO_ACTIVE_LOW>;
3535
cts-gpios = <&gpio5 28 GPIO_ACTIVE_LOW>;
36-
uart-has-rtscts;
3736
status = "okay";
3837
};
3938

arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rs232-rts.dtso

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
pinctrl-0 = <&pinctrl_uart2>;
3434
rts-gpios = <&gpio5 29 GPIO_ACTIVE_LOW>;
3535
cts-gpios = <&gpio5 28 GPIO_ACTIVE_LOW>;
36-
uart-has-rtscts;
3736
status = "okay";
3837
};
3938

arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@
222222
pinctrl-0 = <&pinctrl_uart3>, <&pinctrl_bten>;
223223
cts-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>;
224224
rts-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>;
225-
uart-has-rtscts;
226225
status = "okay";
227226

228227
bluetooth {

0 commit comments

Comments
 (0)