Skip to contentSkip to conversation

ARM: dts: imx25-pinfunc: remove duplicate definition

PATCH New Uwe Kleine-König 2 participants 3 messages Mar 20, 2017 – Mar 22, 2017

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Uwe Kleine-König

author
#0 lore raw

PATCH 1/2 ARM: dts: imx25-pinfunc: remove duplicate definition

This was introduced in commit 18e2b50407fb ("ARM: dts: imx25-pinfunc:
more defines").

Signed-off-by Uwe Kleine-K?nig <[email protected]>
---
 arch/arm/boot/dts/imx25-pinfunc.h | 1 -
 1 file changed, 1 deletion(-)
arch/arm/boot/dts/imx25-pinfunc.h +0 -1
index f840f03ad171..f987afce2f9d 100644
@@ -68,7 +68,6 @@
 
 #define MX25_PAD_A22__A22			0x030 0x000 0x000 0x00 0x000
 #define MX25_PAD_A22__GPIO_2_8			0x030 0x000 0x000 0x05 0x000
-#define MX25_PAD_A22__FEC_TDATA2		0x030 0x000 0x000 0x07 0x000
 #define MX25_PAD_A22__SIM2_VEN1			0x030 0x000 0x000 0x06 0x000
 #define MX25_PAD_A22__FEC_TDATA2		0x030 0x000 0x000 0x07 0x000
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 ARM: dts: imx25-pinfunc: Move MX25_PAD_TDO__TDO to a more sensible place

The pinfunc definitions are ordered by mux_reg and so automatically by conf_reg, too. PAD_TDO is the only pad that has a conf_reg but no mux_reg. Put it to the place where it its in the order of conf_regs instead of the top.

Signed-off-by Uwe Kleine-K?nig <[email protected]>
---
 arch/arm/boot/dts/imx25-pinfunc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx25-pinfunc.h +2 -2
index f987afce2f9d..6c63dca1b9b8 100644
@@ -17,8 +17,6 @@
  * <mux_reg conf_reg input_reg mux_mode input_val>
  */
 
-#define MX25_PAD_TDO__TDO			0x000 0x3e8 0x000 0x00 0x000
-
 #define MX25_PAD_A10__A10			0x008 0x000 0x000 0x00 0x000
 #define MX25_PAD_A10__GPIO_4_0			0x008 0x000 0x000 0x05 0x000
 

@@ -541,6 +539,8 @@
 #define MX25_PAD_RTCK__OWIRE			0x1ec 0x3e4 0x000 0x01 0x000
 #define MX25_PAD_RTCK__GPIO_3_14		0x1ec 0x3e4 0x000 0x05 0x000
 
+#define MX25_PAD_TDO__TDO			0x000 0x3e8 0x000 0x00 0x000
+
 #define MX25_PAD_DE_B__DE_B			0x1f0 0x3ec 0x000 0x00 0x000
 #define MX25_PAD_DE_B__GPIO_2_20		0x1f0 0x3ec 0x000 0x05 0x000
Signature · 1 line
2.11.0