From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: dts: vf610: Nomenclature fixup for PTA6 pin used in RMII mode.
Date: Fri, 12 Jun 2015 17:47:13 +0200 [thread overview]
Message-ID: <1434124033-13820-1-git-send-email-andrew@lunn.ch> (raw)
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 <andrew@lunn.ch>
---
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(-)
diff --git a/arch/arm/boot/dts/vf-colibri.dtsi b/arch/arm/boot/dts/vf-colibri.dtsi
index 68ca125b56ea..8e09b9f34a99 100644
--- a/arch/arm/boot/dts/vf-colibri.dtsi
+++ b/arch/arm/boot/dts/vf-colibri.dtsi
@@ -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
diff --git a/arch/arm/boot/dts/vf610-pinfunc.h b/arch/arm/boot/dts/vf610-pinfunc.h
index fcad7132c871..61ccf6dfd1a7 100644
--- a/arch/arm/boot/dts/vf610-pinfunc.h
+++ b/arch/arm/boot/dts/vf610-pinfunc.h
@@ -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
diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index 375ab23ca743..3f8e1b133bd1 100644
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -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
--
2.1.4
next reply other threads:[~2015-06-12 15:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-12 15:47 Andrew Lunn [this message]
2015-07-08 9:10 ` [PATCH] ARM: dts: vf610: Nomenclature fixup for PTA6 pin used in RMII mode Shawn Guo
2015-07-08 13:53 ` Andrew Lunn
2015-07-09 2:00 ` Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434124033-13820-1-git-send-email-andrew@lunn.ch \
--to=andrew@lunn.ch \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).