Fix macros for the GPIO function for two pads (ENET1_TD3 and I2C2_SCL),
aligning them to the functions specified in the datasheet.
Fixes: a9d562daa3c3 ("imx: Add iMX91 support")
Suggested-by: Javier Viguera <[email protected]>
Signed-off-by: Francesco Valla <[email protected]>
---
Part of this patch was initially sent under a different commit message,
[1] but was then completed with another related bugfix (thanks Javier).
I decided to merge the two because they can be seen as targeted to the
same purpose: proper support of OF_UPSTREAM for any device based on the
i.MX91 SoC.
Since the content is changed, I dropped the R-b tag by Fabio (hoping it
can be gained also for this version).
[1] https://lore.kernel.org/r/[email protected]
Thank you!
Regards,
Francesco
---
arch/arm/dts/imx91-11x11-evk.dts | 2 +-
arch/arm/dts/imx91-pinfunc.h | 4 ++--
arch/arm/include/asm/arch-imx9/imx91_pins.h | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/dts/imx91-11x11-evk.dts b/arch/arm/dts/imx91-11x11-evk.dts
index
65571fc223b779d5aafc87da3940624db32418cf..ca9070a4c76440e72ecb2534ab55596fecb758d5
100644
--- a/arch/arm/dts/imx91-11x11-evk.dts
+++ b/arch/arm/dts/imx91-11x11-evk.dts
@@ -503,7 +503,7 @@
MX91_PAD_ENET1_TD0__GPIO4_IO5
0x31e
MX91_PAD_ENET1_TD1__GPIO4_IO4
0x31e
MX91_PAD_ENET1_TD2__GPIO4_IO3
0x31e
- MX91_PAD_ENET1_TD3__GPIO4_IO3
0x31e
+ MX91_PAD_ENET1_TD3__GPIO4_IO2
0x31e
MX91_PAD_ENET1_TXC__GPIO4_IO7
0x31e
MX91_PAD_ENET1_TX_CTL__GPIO4_IO6
0x31e
>;
diff --git a/arch/arm/dts/imx91-pinfunc.h b/arch/arm/dts/imx91-pinfunc.h
index
b0066df173b1386f040b0776fd798406a6e39e06..5677928ab7c4bdc1cfa02d7a1107e9c1da94d329
100644
--- a/arch/arm/dts/imx91-pinfunc.h
+++ b/arch/arm/dts/imx91-pinfunc.h
@@ -330,7 +330,7 @@
#define MX91_PAD_ENET1_TD3__CAN2_TX
0x00a0 0x0250 0x0000 0x02 0x00
#define MX91_PAD_ENET1_TD3__HSIOMIX_OTG_ID2
0x00a0 0x0250 0x0000 0x03 0x00
#define MX91_PAD_ENET1_TD3__FLEXIO2_FLEXIO2
0x00a0 0x0250 0x0000 0x04 0x00
-#define MX91_PAD_ENET1_TD3__GPIO4_IO3
0x00a0 0x0250 0x0000 0x05 0x00
+#define MX91_PAD_ENET1_TD3__GPIO4_IO2
0x00a0 0x0250 0x0000 0x05 0x00
#define MX91_PAD_ENET1_TD3__LPI2C2_SCL
0x00a0 0x0250 0x03e8 0x06 0x00
#define MX91_PAD_ENET1_TD2__ENET_QOS_RGMII_TD2
0x00a4 0x0254 0x0000 0x00 0x00
@@ -680,7 +680,7 @@
#define MX91_PAD_I2C2_SCL__LPUART2_DCB_B
0x0178 0x0328 0x0000 0x02 0x00
#define MX91_PAD_I2C2_SCL__TPM2_CH2
0x0178 0x0328 0x0000 0x03 0x00
#define MX91_PAD_I2C2_SCL__SAI1_RX_SYNC
0x0178 0x0328 0x0000 0x04 0x00
-#define MX91_PAD_I2C2_SCL__GPIO1_IO3
0x0178 0x0328 0x0000 0x05 0x00
+#define MX91_PAD_I2C2_SCL__GPIO1_IO2
0x0178 0x0328 0x0000 0x05 0x00
#define MX91_PAD_I2C2_SCL__I3C1_PUR_B
0x0178 0x0328 0x0000 0x06 0x00
#define MX91_PAD_I2C2_SDA__LPI2C2_SDA
0x017c 0x032c 0x03ec 0x00 0x01
diff --git a/arch/arm/include/asm/arch-imx9/imx91_pins.h
b/arch/arm/include/asm/arch-imx9/imx91_pins.h
index
26246702a9607cd1ba6c8a15be9313db63b2a4af..838a81422575cd99726e8bfc74a94f34e6d38f50
100644
--- a/arch/arm/include/asm/arch-imx9/imx91_pins.h
+++ b/arch/arm/include/asm/arch-imx9/imx91_pins.h
@@ -329,7 +329,7 @@ enum {
MX91_PAD_ENET1_TD3__CAN2_TX
= IOMUX_PAD(0x0250, 0x00A0, 0x02, 0x0000, 0x00, 0x00),
MX91_PAD_ENET1_TD3__HSIOMIX_OTG_ID2
= IOMUX_PAD(0x0250, 0x00A0, 0x03, 0x0000, 0x00, 0x00),
MX91_PAD_ENET1_TD3__FLEXIO2_FLEXIO2
= IOMUX_PAD(0x0250, 0x00A0, 0x04, 0x0000, 0x00, 0x00),
- MX91_PAD_ENET1_TD3__GPIO4_IO3
= IOMUX_PAD(0x0250, 0x00A0, 0x05, 0x0000, 0x00, 0x00),
+ MX91_PAD_ENET1_TD3__GPIO4_IO2
= IOMUX_PAD(0x0250, 0x00A0, 0x05, 0x0000, 0x00, 0x00),
MX91_PAD_ENET1_TD3__LPI2C2_SCL
= IOMUX_PAD(0x0250, 0x00A0, 0x06, 0x03E8, 0x00, 0x00),
MX91_PAD_ENET1_TD2__ENET_QOS_RGMII_TD2
= IOMUX_PAD(0x0254, 0x00A4, 0x00, 0x0000, 0x00, 0x00),
@@ -679,7 +679,7 @@ enum {
MX91_PAD_I2C2_SCL__LPUART2_DCB_B
= IOMUX_PAD(0x0328, 0x0178, 0x02, 0x0000, 0x00, 0x00),
MX91_PAD_I2C2_SCL__TPM2_CH2
= IOMUX_PAD(0x0328, 0x0178, 0x03, 0x0000, 0x00, 0x00),
MX91_PAD_I2C2_SCL__SAI1_RX_SYNC
= IOMUX_PAD(0x0328, 0x0178, 0x04, 0x0000, 0x00, 0x00),
- MX91_PAD_I2C2_SCL__GPIO1_IO3
= IOMUX_PAD(0x0328, 0x0178, 0x05, 0x0000, 0x00, 0x00),
+ MX91_PAD_I2C2_SCL__GPIO1_IO2
= IOMUX_PAD(0x0328, 0x0178, 0x05, 0x0000, 0x00, 0x00),
MX91_PAD_I2C2_SCL__I3C1_PUR_B
= IOMUX_PAD(0x0328, 0x0178, 0x06, 0x0000, 0x00, 0x00),
MX91_PAD_I2C2_SDA__LPI2C2_SDA
= IOMUX_PAD(0x032C, 0x017C, 0x00, 0x03EC, 0x01, 0x00),
---
base-commit: 365a7079fb918643da0f0709660a7d8ea76dd6f3
change-id: 20251111-imx91_pins_fix-6bfae694156c
Best regards,
--
Francesco Valla <[email protected]>
