* [PATCH] ARM: dts: imx25/karo-tx25: Replace NO_PAD_CTL by explicit pad configuration
@ 2023-06-15 9:41 Uwe Kleine-König
2023-06-15 10:01 ` Uwe Kleine-König
2023-07-17 1:06 ` Shawn Guo
0 siblings, 2 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2023-06-15 9:41 UTC (permalink / raw)
To: Shawn Guo
Cc: Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
NXP Linux Team, linux-arm-kernel
Instead of using 0x80000000 explicitly specify the reset defaults for
the pad settings. This way the pad configuration is explicit and so
isn't affected by changes that might have been done in the bootloader.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
arch/arm/boot/dts/imx25-karo-tx25.dts | 50 +++++++++++++--------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/arch/arm/boot/dts/imx25-karo-tx25.dts b/arch/arm/boot/dts/imx25-karo-tx25.dts
index 0950eb66d3d9..57d5ade5aa46 100644
--- a/arch/arm/boot/dts/imx25-karo-tx25.dts
+++ b/arch/arm/boot/dts/imx25-karo-tx25.dts
@@ -39,46 +39,46 @@ memory@80000000 {
&iomuxc {
pinctrl_uart1: uart1grp {
fsl,pins = <
- MX25_PAD_UART1_TXD__UART1_TXD 0x80000000
- MX25_PAD_UART1_RXD__UART1_RXD 0x80000000
- MX25_PAD_UART1_CTS__UART1_CTS 0x80000000
- MX25_PAD_UART1_RTS__UART1_RTS 0x80000000
+ MX25_PAD_UART1_TXD__UART1_TXD 0x00000020
+ MX25_PAD_UART1_RXD__UART1_RXD 0x000000a0
+ MX25_PAD_UART1_CTS__UART1_CTS 0x00000060
+ MX25_PAD_UART1_RTS__UART1_RTS 0x000000e0
>;
};
pinctrl_fec: fecgrp {
fsl,pins = <
- MX25_PAD_D11__GPIO_4_9 0x80000000 /* FEC PHY power on pin */
- MX25_PAD_D13__GPIO_4_7 0x80000000 /* FEC reset */
- MX25_PAD_FEC_MDC__FEC_MDC 0x80000000
- MX25_PAD_FEC_MDIO__FEC_MDIO 0x80000000
- MX25_PAD_FEC_TDATA0__FEC_TDATA0 0x80000000
- MX25_PAD_FEC_TDATA1__FEC_TDATA1 0x80000000
- MX25_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
- MX25_PAD_FEC_RDATA0__FEC_RDATA0 0x80000000
- MX25_PAD_FEC_RDATA1__FEC_RDATA1 0x80000000
- MX25_PAD_FEC_RX_DV__FEC_RX_DV 0x80000000
- MX25_PAD_FEC_TX_CLK__FEC_TX_CLK 0x80000000
+ MX25_PAD_D11__GPIO_4_9 0x00000021 /* FEC PHY power on pin */
+ MX25_PAD_D13__GPIO_4_7 0x000000a1 /* FEC reset */
+ MX25_PAD_FEC_MDC__FEC_MDC 0x00000060
+ MX25_PAD_FEC_MDIO__FEC_MDIO 0x000001f0
+ MX25_PAD_FEC_TDATA0__FEC_TDATA0 0x00000060
+ MX25_PAD_FEC_TDATA1__FEC_TDATA1 0x00000060
+ MX25_PAD_FEC_TX_EN__FEC_TX_EN 0x00000060
+ MX25_PAD_FEC_RDATA0__FEC_RDATA0 0x000000c1
+ MX25_PAD_FEC_RDATA1__FEC_RDATA1 0x000000c0
+ MX25_PAD_FEC_RX_DV__FEC_RX_DV 0x000000c0
+ MX25_PAD_FEC_TX_CLK__FEC_TX_CLK 0x000000c0
>;
};
pinctrl_nfc: nfcgrp {
fsl,pins = <
- MX25_PAD_NF_CE0__NF_CE0 0x80000000
+ MX25_PAD_NF_CE0__NF_CE0 0x00000001
MX25_PAD_NFWE_B__NFWE_B 0x80000000
MX25_PAD_NFRE_B__NFRE_B 0x80000000
MX25_PAD_NFALE__NFALE 0x80000000
MX25_PAD_NFCLE__NFCLE 0x80000000
MX25_PAD_NFWP_B__NFWP_B 0x80000000
- MX25_PAD_NFRB__NFRB 0x80000000
- MX25_PAD_D7__D7 0x80000000
- MX25_PAD_D6__D6 0x80000000
- MX25_PAD_D5__D5 0x80000000
- MX25_PAD_D4__D4 0x80000000
- MX25_PAD_D3__D3 0x80000000
- MX25_PAD_D2__D2 0x80000000
- MX25_PAD_D1__D1 0x80000000
- MX25_PAD_D0__D0 0x80000000
+ MX25_PAD_NFRB__NFRB 0x000000e0
+ MX25_PAD_D7__D7 0x00000080
+ MX25_PAD_D6__D6 0x00000080
+ MX25_PAD_D5__D5 0x00000080
+ MX25_PAD_D4__D4 0x00000080
+ MX25_PAD_D3__D3 0x00000080
+ MX25_PAD_D2__D2 0x00000080
+ MX25_PAD_D1__D1 0x00000000
+ MX25_PAD_D0__D0 0x00000080
>;
};
};
base-commit: b16049b21162bb649cdd8519642a35972b7910fe
--
2.39.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] ARM: dts: imx25/karo-tx25: Replace NO_PAD_CTL by explicit pad configuration
2023-06-15 9:41 [PATCH] ARM: dts: imx25/karo-tx25: Replace NO_PAD_CTL by explicit pad configuration Uwe Kleine-König
@ 2023-06-15 10:01 ` Uwe Kleine-König
2023-07-17 1:06 ` Shawn Guo
1 sibling, 0 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2023-06-15 10:01 UTC (permalink / raw)
To: Shawn Guo
Cc: linux-arm-kernel, Sascha Hauer, Fabio Estevam, NXP Linux Team,
Pengutronix Kernel Team
[-- Attachment #1.1: Type: text/plain, Size: 3172 bytes --]
On Thu, Jun 15, 2023 at 11:41:00AM +0200, Uwe Kleine-König wrote:
> Instead of using 0x80000000 explicitly specify the reset defaults for
> the pad settings. This way the pad configuration is explicit and so
> isn't affected by changes that might have been done in the bootloader.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> arch/arm/boot/dts/imx25-karo-tx25.dts | 50 +++++++++++++--------------
> 1 file changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx25-karo-tx25.dts b/arch/arm/boot/dts/imx25-karo-tx25.dts
> index 0950eb66d3d9..57d5ade5aa46 100644
> --- a/arch/arm/boot/dts/imx25-karo-tx25.dts
> +++ b/arch/arm/boot/dts/imx25-karo-tx25.dts
> @@ -39,46 +39,46 @@ memory@80000000 {
> &iomuxc {
> pinctrl_uart1: uart1grp {
> fsl,pins = <
> - MX25_PAD_UART1_TXD__UART1_TXD 0x80000000
> - MX25_PAD_UART1_RXD__UART1_RXD 0x80000000
> - MX25_PAD_UART1_CTS__UART1_CTS 0x80000000
> - MX25_PAD_UART1_RTS__UART1_RTS 0x80000000
> + MX25_PAD_UART1_TXD__UART1_TXD 0x00000020
> + MX25_PAD_UART1_RXD__UART1_RXD 0x000000a0
> + MX25_PAD_UART1_CTS__UART1_CTS 0x00000060
> + MX25_PAD_UART1_RTS__UART1_RTS 0x000000e0
> >;
> };
>
> pinctrl_fec: fecgrp {
> fsl,pins = <
> - MX25_PAD_D11__GPIO_4_9 0x80000000 /* FEC PHY power on pin */
> - MX25_PAD_D13__GPIO_4_7 0x80000000 /* FEC reset */
> - MX25_PAD_FEC_MDC__FEC_MDC 0x80000000
> - MX25_PAD_FEC_MDIO__FEC_MDIO 0x80000000
> - MX25_PAD_FEC_TDATA0__FEC_TDATA0 0x80000000
> - MX25_PAD_FEC_TDATA1__FEC_TDATA1 0x80000000
> - MX25_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000
> - MX25_PAD_FEC_RDATA0__FEC_RDATA0 0x80000000
> - MX25_PAD_FEC_RDATA1__FEC_RDATA1 0x80000000
> - MX25_PAD_FEC_RX_DV__FEC_RX_DV 0x80000000
> - MX25_PAD_FEC_TX_CLK__FEC_TX_CLK 0x80000000
> + MX25_PAD_D11__GPIO_4_9 0x00000021 /* FEC PHY power on pin */
> + MX25_PAD_D13__GPIO_4_7 0x000000a1 /* FEC reset */
> + MX25_PAD_FEC_MDC__FEC_MDC 0x00000060
> + MX25_PAD_FEC_MDIO__FEC_MDIO 0x000001f0
> + MX25_PAD_FEC_TDATA0__FEC_TDATA0 0x00000060
> + MX25_PAD_FEC_TDATA1__FEC_TDATA1 0x00000060
> + MX25_PAD_FEC_TX_EN__FEC_TX_EN 0x00000060
> + MX25_PAD_FEC_RDATA0__FEC_RDATA0 0x000000c1
> + MX25_PAD_FEC_RDATA1__FEC_RDATA1 0x000000c0
> + MX25_PAD_FEC_RX_DV__FEC_RX_DV 0x000000c0
> + MX25_PAD_FEC_TX_CLK__FEC_TX_CLK 0x000000c0
> >;
> };
>
> pinctrl_nfc: nfcgrp {
> fsl,pins = <
> - MX25_PAD_NF_CE0__NF_CE0 0x80000000
> + MX25_PAD_NF_CE0__NF_CE0 0x00000001
> MX25_PAD_NFWE_B__NFWE_B 0x80000000
> MX25_PAD_NFRE_B__NFRE_B 0x80000000
> MX25_PAD_NFALE__NFALE 0x80000000
> MX25_PAD_NFCLE__NFCLE 0x80000000
> MX25_PAD_NFWP_B__NFWP_B 0x80000000
One thing I forgot to point out: I didn't touch these values because the
respective pins don't have a padctrl register. I wonder if these should
be 0x00000000 for consistency? Someone has a strong opinion here?
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ARM: dts: imx25/karo-tx25: Replace NO_PAD_CTL by explicit pad configuration
2023-06-15 9:41 [PATCH] ARM: dts: imx25/karo-tx25: Replace NO_PAD_CTL by explicit pad configuration Uwe Kleine-König
2023-06-15 10:01 ` Uwe Kleine-König
@ 2023-07-17 1:06 ` Shawn Guo
2023-07-17 7:03 ` Uwe Kleine-König
1 sibling, 1 reply; 5+ messages in thread
From: Shawn Guo @ 2023-07-17 1:06 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam,
NXP Linux Team, linux-arm-kernel
On Thu, Jun 15, 2023 at 11:41:00AM +0200, Uwe Kleine-König wrote:
> Instead of using 0x80000000 explicitly specify the reset defaults for
> the pad settings. This way the pad configuration is explicit and so
> isn't affected by changes that might have been done in the bootloader.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> arch/arm/boot/dts/imx25-karo-tx25.dts | 50 +++++++++++++--------------
> 1 file changed, 25 insertions(+), 25 deletions(-)
It doesn't apply any more. Could you rebase and resend?
Shawn
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: dts: imx25/karo-tx25: Replace NO_PAD_CTL by explicit pad configuration
2023-07-17 1:06 ` Shawn Guo
@ 2023-07-17 7:03 ` Uwe Kleine-König
2023-07-18 0:05 ` Shawn Guo
0 siblings, 1 reply; 5+ messages in thread
From: Uwe Kleine-König @ 2023-07-17 7:03 UTC (permalink / raw)
To: Shawn Guo
Cc: linux-arm-kernel, Sascha Hauer, Fabio Estevam, NXP Linux Team,
Pengutronix Kernel Team
[-- Attachment #1.1: Type: text/plain, Size: 1003 bytes --]
Hello Shawn,
On Mon, Jul 17, 2023 at 09:06:52AM +0800, Shawn Guo wrote:
> On Thu, Jun 15, 2023 at 11:41:00AM +0200, Uwe Kleine-König wrote:
> > Instead of using 0x80000000 explicitly specify the reset defaults for
> > the pad settings. This way the pad configuration is explicit and so
> > isn't affected by changes that might have been done in the bootloader.
> >
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > ---
> > arch/arm/boot/dts/imx25-karo-tx25.dts | 50 +++++++++++++--------------
> > 1 file changed, 25 insertions(+), 25 deletions(-)
>
> It doesn't apply any more. Could you rebase and resend?
when using git am -3 to apply, it works fine for me on top of
next-20230717 and v6.5-rc2. Can you please either use -3, too, or tell
me which tree I should rebase to?
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: dts: imx25/karo-tx25: Replace NO_PAD_CTL by explicit pad configuration
2023-07-17 7:03 ` Uwe Kleine-König
@ 2023-07-18 0:05 ` Shawn Guo
0 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2023-07-18 0:05 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: linux-arm-kernel, Sascha Hauer, Fabio Estevam, NXP Linux Team,
Pengutronix Kernel Team
On Mon, Jul 17, 2023 at 09:03:50AM +0200, Uwe Kleine-König wrote:
> Hello Shawn,
>
> On Mon, Jul 17, 2023 at 09:06:52AM +0800, Shawn Guo wrote:
> > On Thu, Jun 15, 2023 at 11:41:00AM +0200, Uwe Kleine-König wrote:
> > > Instead of using 0x80000000 explicitly specify the reset defaults for
> > > the pad settings. This way the pad configuration is explicit and so
> > > isn't affected by changes that might have been done in the bootloader.
> > >
> > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > > ---
> > > arch/arm/boot/dts/imx25-karo-tx25.dts | 50 +++++++++++++--------------
> > > 1 file changed, 25 insertions(+), 25 deletions(-)
> >
> > It doesn't apply any more. Could you rebase and resend?
>
> when using git am -3 to apply, it works fine for me on top of
> next-20230717 and v6.5-rc2.
Ah, I completely forgot about 3-way merge parameter :)
Applied, thanks!
Shawn
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-19 6:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-15 9:41 [PATCH] ARM: dts: imx25/karo-tx25: Replace NO_PAD_CTL by explicit pad configuration Uwe Kleine-König
2023-06-15 10:01 ` Uwe Kleine-König
2023-07-17 1:06 ` Shawn Guo
2023-07-17 7:03 ` Uwe Kleine-König
2023-07-18 0:05 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).