Skip to contentSkip to conversation

ARM: dts: vf610: Nomenclature fixup for PTA6 pin used in RMII mode.

PATCH New Andrew Lunn 2 participants 4 messages Jun 12, 2015 – Jul 9, 2015 Device tree bindings

lore
Share & tools
lore

Andrew Lunn

author
#0 lore raw

PATCH 1/1 ARM: dts: vf610: Nomenclature fixup for PTA6 pin used in RMII mode.

Add a missing _ENET_ infix to PTA6 when used in RMII mode. This makes it consistent with all other pinctrl aliases for Ethernet.

Signed-off-by Andrew Lunn <[email protected]>
---
 arch/arm/boot/dts/vf-colibri.dtsi | 2 +-
 arch/arm/boot/dts/vf610-pinfunc.h | 8 ++++----
 arch/arm/boot/dts/vf610-twr.dts   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/vf-colibri.dtsi +1 -1
index 68ca125b56ea..8e09b9f34a99 100644
@@ -136,7 +136,7 @@
 
 		pinctrl_fec1: fec1grp {
 			fsl,pins = <
-				VF610_PAD_PTA6__RMII_CLKOUT		0x30d2
+				VF610_PAD_PTA6__ENET_RMII_CLKOUT	0x30d2
 				VF610_PAD_PTC9__ENET_RMII1_MDC		0x30d2
 				VF610_PAD_PTC10__ENET_RMII1_MDIO	0x30d3
 				VF610_PAD_PTC11__ENET_RMII1_CRS		0x30d1
arch/arm/boot/dts/vf610-pinfunc.h +4 -4
index fcad7132c871..61ccf6dfd1a7 100644
@@ -26,8 +26,8 @@
 
 
 #define VF610_PAD_PTA6__GPIO_0			0x000 0x000 ALT0 0x0
-#define VF610_PAD_PTA6__RMII_CLKOUT		0x000 0x000 ALT1 0x0
-#define VF610_PAD_PTA6__RMII_CLKIN		0x000 0x2F0 ALT2 0x0
+#define VF610_PAD_PTA6__ENET_RMII_CLKOUT	0x000 0x000 ALT1 0x0
+#define VF610_PAD_PTA6__ENET_RMII_CLKIN		0x000 0x2F0 ALT2 0x0
 #define VF610_PAD_PTA6__DCU1_TCON11		0x000 0x000 ALT4 0x0
 #define VF610_PAD_PTA6__DCU1_R2			0x000 0x000 ALT7 0x0
 #define VF610_PAD_PTA8__GPIO_1			0x004 0x000 ALT0 0x0

@@ -36,8 +36,8 @@
 #define VF610_PAD_PTA8__MLB_CLK			0x004 0x354 ALT7 0x0
 #define VF610_PAD_PTA9__GPIO_2			0x008 0x000 ALT0 0x0
 #define VF610_PAD_PTA9__TDI			0x008 0x000 ALT1 0x0
-#define VF610_PAD_PTA9__RMII_CLKOUT		0x008 0x000 ALT2 0x0
-#define VF610_PAD_PTA9__RMII_CLKIN		0x008 0x2F0 ALT3 0x1
+#define VF610_PAD_PTA9__ENET_RMII_CLKOUT	0x008 0x000 ALT2 0x0
+#define VF610_PAD_PTA9__ENET_RMII_CLKIN		0x008 0x2F0 ALT3 0x1
 #define VF610_PAD_PTA9__DCU0_R1			0x008 0x000 ALT4 0x0
 #define VF610_PAD_PTA9__WDOG_B			0x008 0x000 ALT6 0x0
 #define VF610_PAD_PTA10__GPIO_3			0x00C 0x000 ALT0 0x0
arch/arm/boot/dts/vf610-twr.dts +1 -1
index 375ab23ca743..3f8e1b133bd1 100644
@@ -203,7 +203,7 @@
 
 		pinctrl_fec0: fec0grp {
 			fsl,pins = <
-				VF610_PAD_PTA6__RMII_CLKIN		0x30d1
+				VF610_PAD_PTA6__ENET_RMII_CLKIN		0x30d1
 				VF610_PAD_PTC0__ENET_RMII0_MDC		0x30d3
 				VF610_PAD_PTC1__ENET_RMII0_MDIO		0x30d1
 				VF610_PAD_PTC2__ENET_RMII0_CRS		0x30d1
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 ARM: dts: vf610: Nomenclature fixup for PTA6 pin used in RMII mode.

Quoted 4 lines · Andrew Lunn

Add a missing _ENET_ infix to PTA6 when used in RMII mode. This makes it consistent with all other pinctrl aliases for Ethernet.

Signed-off-by Andrew Lunn <[email protected]>

No, the existing naming is just fine, which follows how Vybrid Reference Manual names them.

Shawn

Quoted 67 lines
---
 arch/arm/boot/dts/vf-colibri.dtsi | 2 +-
 arch/arm/boot/dts/vf610-pinfunc.h | 8 ++++----
 arch/arm/boot/dts/vf610-twr.dts   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/vf-colibri.dtsi +1 -1
index 68ca125b56ea..8e09b9f34a99 100644
@@ -136,7 +136,7 @@
 
 		pinctrl_fec1: fec1grp {
 			fsl,pins = <
-				VF610_PAD_PTA6__RMII_CLKOUT		0x30d2
+				VF610_PAD_PTA6__ENET_RMII_CLKOUT	0x30d2
 				VF610_PAD_PTC9__ENET_RMII1_MDC		0x30d2
 				VF610_PAD_PTC10__ENET_RMII1_MDIO	0x30d3
 				VF610_PAD_PTC11__ENET_RMII1_CRS		0x30d1
arch/arm/boot/dts/vf610-pinfunc.h +4 -4
index fcad7132c871..61ccf6dfd1a7 100644
@@ -26,8 +26,8 @@
 
 
 #define VF610_PAD_PTA6__GPIO_0			0x000 0x000 ALT0 0x0
-#define VF610_PAD_PTA6__RMII_CLKOUT		0x000 0x000 ALT1 0x0
-#define VF610_PAD_PTA6__RMII_CLKIN		0x000 0x2F0 ALT2 0x0
+#define VF610_PAD_PTA6__ENET_RMII_CLKOUT	0x000 0x000 ALT1 0x0
+#define VF610_PAD_PTA6__ENET_RMII_CLKIN		0x000 0x2F0 ALT2 0x0
 #define VF610_PAD_PTA6__DCU1_TCON11		0x000 0x000 ALT4 0x0
 #define VF610_PAD_PTA6__DCU1_R2			0x000 0x000 ALT7 0x0
 #define VF610_PAD_PTA8__GPIO_1			0x004 0x000 ALT0 0x0

@@ -36,8 +36,8 @@
 #define VF610_PAD_PTA8__MLB_CLK			0x004 0x354 ALT7 0x0
 #define VF610_PAD_PTA9__GPIO_2			0x008 0x000 ALT0 0x0
 #define VF610_PAD_PTA9__TDI			0x008 0x000 ALT1 0x0
-#define VF610_PAD_PTA9__RMII_CLKOUT		0x008 0x000 ALT2 0x0
-#define VF610_PAD_PTA9__RMII_CLKIN		0x008 0x2F0 ALT3 0x1
+#define VF610_PAD_PTA9__ENET_RMII_CLKOUT	0x008 0x000 ALT2 0x0
+#define VF610_PAD_PTA9__ENET_RMII_CLKIN		0x008 0x2F0 ALT3 0x1
 #define VF610_PAD_PTA9__DCU0_R1			0x008 0x000 ALT4 0x0
 #define VF610_PAD_PTA9__WDOG_B			0x008 0x000 ALT6 0x0
 #define VF610_PAD_PTA10__GPIO_3			0x00C 0x000 ALT0 0x0
arch/arm/boot/dts/vf610-twr.dts +1 -1
index 375ab23ca743..3f8e1b133bd1 100644
@@ -203,7 +203,7 @@
 
 		pinctrl_fec0: fec0grp {
 			fsl,pins = <
-				VF610_PAD_PTA6__RMII_CLKIN		0x30d1
+				VF610_PAD_PTA6__ENET_RMII_CLKIN		0x30d1
 				VF610_PAD_PTC0__ENET_RMII0_MDC		0x30d3
 				VF610_PAD_PTC1__ENET_RMII0_MDIO		0x30d1
 				VF610_PAD_PTC2__ENET_RMII0_CRS		0x30d1
Signature · 7 lines
2.1.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author
#2 lore raw

PATCH 1/1 ARM: dts: vf610: Nomenclature fixup for PTA6 pin used in RMII mode.

Quoted 8 lines · Shawn Guo
Quoted 4 lines · Andrew Lunn

Add a missing _ENET_ infix to PTA6 when used in RMII mode. This makes it consistent with all other pinctrl aliases for Ethernet.

Signed-off-by Andrew Lunn <[email protected]>

No, the existing naming is just fine, which follows how Vybrid Reference Manual names them.

So are you saying you want to see a patch removing the ENET_ from VF610_PAD_PTC9__ENET_RMII1_MDC, VF610_PAD_PTC10__ENET_RMII1_MDIO, VF610_PAD_PTC11__ENET_RMII1_CRS, etc. A quick search for VYBRIDRM Rev 7, 06/2014 does not get any hits for ENET_RMII

Thanks
Andrew

#3 lore raw

PATCH 1/1 ARM: dts: vf610: Nomenclature fixup for PTA6 pin used in RMII mode.

Quoted 7 lines · Andrew Lunn
Quoted 6 lines · Shawn Guo
Quoted 4 lines · Andrew Lunn

Add a missing _ENET_ infix to PTA6 when used in RMII mode. This makes it consistent with all other pinctrl aliases for Ethernet.

Signed-off-by Andrew Lunn <[email protected]>
Quoted 7 lines
Quoted 2 lines

No, the existing naming is just fine, which follows how Vybrid Reference Manual names them.

So are you saying you want to see a patch removing the ENET_ from VF610_PAD_PTC9__ENET_RMII1_MDC, VF610_PAD_PTC10__ENET_RMII1_MDIO, VF610_PAD_PTC11__ENET_RMII1_CRS, etc. A quick search for VYBRIDRM Rev 7, 06/2014 does not get any hits for ENET_RMII

Yes. We should keep the naming consistent with Reference Manual.

Shawn