* [PATCH 1/2] ARM: dts: imx25-pinfunc: remove duplicate definition
@ 2017-03-20 8:21 Uwe Kleine-König
2017-03-20 8:21 ` [PATCH 2/2] ARM: dts: imx25-pinfunc: Move MX25_PAD_TDO__TDO to a more sensible place Uwe Kleine-König
2017-03-22 6:45 ` [PATCH 1/2] ARM: dts: imx25-pinfunc: remove duplicate definition Shawn Guo
0 siblings, 2 replies; 3+ messages in thread
From: Uwe Kleine-König @ 2017-03-20 8:21 UTC (permalink / raw)
To: linux-arm-kernel
This was introduced in commit 18e2b50407fb ("ARM: dts: imx25-pinfunc:
more defines").
Signed-off-by: Uwe Kleine-K?nig <uwe@kleine-koenig.org>
---
arch/arm/boot/dts/imx25-pinfunc.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx25-pinfunc.h b/arch/arm/boot/dts/imx25-pinfunc.h
index f840f03ad171..f987afce2f9d 100644
--- a/arch/arm/boot/dts/imx25-pinfunc.h
+++ b/arch/arm/boot/dts/imx25-pinfunc.h
@@ -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
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: dts: imx25-pinfunc: Move MX25_PAD_TDO__TDO to a more sensible place
2017-03-20 8:21 [PATCH 1/2] ARM: dts: imx25-pinfunc: remove duplicate definition Uwe Kleine-König
@ 2017-03-20 8:21 ` Uwe Kleine-König
2017-03-22 6:45 ` [PATCH 1/2] ARM: dts: imx25-pinfunc: remove duplicate definition Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Uwe Kleine-König @ 2017-03-20 8:21 UTC (permalink / raw)
To: linux-arm-kernel
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 <uwe@kleine-koenig.org>
---
arch/arm/boot/dts/imx25-pinfunc.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx25-pinfunc.h b/arch/arm/boot/dts/imx25-pinfunc.h
index f987afce2f9d..6c63dca1b9b8 100644
--- a/arch/arm/boot/dts/imx25-pinfunc.h
+++ b/arch/arm/boot/dts/imx25-pinfunc.h
@@ -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
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/2] ARM: dts: imx25-pinfunc: remove duplicate definition
2017-03-20 8:21 [PATCH 1/2] ARM: dts: imx25-pinfunc: remove duplicate definition Uwe Kleine-König
2017-03-20 8:21 ` [PATCH 2/2] ARM: dts: imx25-pinfunc: Move MX25_PAD_TDO__TDO to a more sensible place Uwe Kleine-König
@ 2017-03-22 6:45 ` Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2017-03-22 6:45 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Mar 20, 2017 at 09:21:10AM +0100, Uwe Kleine-K?nig wrote:
> This was introduced in commit 18e2b50407fb ("ARM: dts: imx25-pinfunc:
> more defines").
>
> Signed-off-by: Uwe Kleine-K?nig <uwe@kleine-koenig.org>
Applied both, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-22 6:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-20 8:21 [PATCH 1/2] ARM: dts: imx25-pinfunc: remove duplicate definition Uwe Kleine-König
2017-03-20 8:21 ` [PATCH 2/2] ARM: dts: imx25-pinfunc: Move MX25_PAD_TDO__TDO to a more sensible place Uwe Kleine-König
2017-03-22 6:45 ` [PATCH 1/2] ARM: dts: imx25-pinfunc: remove duplicate definition 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).