From 669deac4f9bb806c4f8d7f76408d47106b9a5f14 Mon Sep 17 00:00:00 2001
From: Tim Harvey <tharvey@gateworks.com>
Date: Mon, 22 Jul 2024 13:40:01 -0700
Subject: [PATCH 1/4] arm64: dts: imx8mp-venice: fix USB_OC pinmux
NXP's kernel has differing names for the USB controller pinmux
definitions.
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---
arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi | 2 +-
arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi | 2 +-
arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi | 2 +-
arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi
index c531564c7ebb..33cba55035f1 100644
a
|
b
|
MX8MP_IOMUXC_SAI1_RXD1__GPIO4_IO03 0x146
|
201 | 201 | |
202 | 202 | pinctrl_usb1: usb1grp { |
203 | 203 | fsl,pins = < |
204 | | MX8MP_IOMUXC_GPIO1_IO13__USB1_OTG_OC 0x140 /* USB1_FLT# */ |
| 204 | MX8MP_IOMUXC_GPIO1_IO13__USB1_OC 0x140 /* USB1_FLT# */ |
205 | 205 | >; |
206 | 206 | }; |
207 | 207 | |
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi
index f3bab22d5e68..e6ff06593b6e 100644
a
|
b
|
MX8MP_IOMUXC_GPIO1_IO12__GPIO1_IO12 0x146 /* USB1_EN */
|
264 | 264 | |
265 | 265 | pinctrl_usb1: usb1grp { |
266 | 266 | fsl,pins = < |
267 | | MX8MP_IOMUXC_GPIO1_IO13__USB1_OTG_OC 0x140 /* USB1_FLT# */ |
| 267 | MX8MP_IOMUXC_GPIO1_IO13__USB1_OC 0x140 /* USB1_FLT# */ |
268 | 268 | >; |
269 | 269 | }; |
270 | 270 | |
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi
index 68c62def4c06..7d186e442be4 100644
a
|
b
|
MX8MP_IOMUXC_GPIO1_IO12__GPIO1_IO12 0x146 /* USB1_EN */
|
305 | 305 | |
306 | 306 | pinctrl_usb1: usb1grp { |
307 | 307 | fsl,pins = < |
308 | | MX8MP_IOMUXC_GPIO1_IO13__USB1_OTG_OC 0x140 /* USB1_FLT# */ |
| 308 | MX8MP_IOMUXC_GPIO1_IO13__USB1_OC 0x140 /* USB1_FLT# */ |
309 | 309 | >; |
310 | 310 | }; |
311 | 311 | |
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts b/arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts
index faa370a5885f..04382f952b0e 100644
a
|
b
|
MX8MP_IOMUXC_UART4_TXD__UART4_DCE_TX 0x140
|
1018 | 1018 | |
1019 | 1019 | pinctrl_usb1: usb1grp { |
1020 | 1020 | fsl,pins = < |
1021 | | MX8MP_IOMUXC_GPIO1_IO13__USB1_OTG_OC 0x140 |
| 1021 | MX8MP_IOMUXC_GPIO1_IO13__USB1_OC 0x140 |
1022 | 1022 | >; |
1023 | 1023 | }; |
1024 | 1024 | |