* [PATCHv0 1/2] arm: mvebu: fix wrongly named DS414 pinctrl entries
2014-11-22 16:19 [PATCHv0 0/2] arm: mvebu: fixes for previous DS213j/DS414 series Arnaud Ebalard
@ 2014-11-22 16:19 ` Arnaud Ebalard
2014-11-22 16:23 ` [PATCHv0 2/2] arm: mvebu: normalize pinctrl entries for Armada SoCs Arnaud Ebalard
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Arnaud Ebalard @ 2014-11-22 16:19 UTC (permalink / raw)
To: linux-arm-kernel
While renaming pinctrl entries during reviews of Synology DS414 support
series, I missed three entries, as reported by Ben. This patch fixes
those.
Reported-by: Ben Peddell <klightspeed@killerwolves.net>
Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
---
arch/arm/boot/dts/armada-xp-synology-ds414.dts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
index ba5e94d27c21..97cbf980c54d 100644
--- a/arch/arm/boot/dts/armada-xp-synology-ds414.dts
+++ b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
@@ -308,17 +308,17 @@
marvell,function = "gpio";
};
- pmx_syno_id_bit1: syno-id-bit1-pin {
+ syno_id_bit1_pin: syno-id-bit1-pin {
marvell,pins = "mpp28";
marvell,function = "gpio";
};
- pmx_syno_id_bit2: syno-id-bit2-pin {
+ syno_id_bit2_pin: syno-id-bit2-pin {
marvell,pins = "mpp29";
marvell,function = "gpio";
};
- pmx_fan1_alarm: fan1-alarm-pin {
+ fan1_alarm_pin: fan1-alarm-pin {
marvell,pins = "mpp33";
marvell,function = "gpio";
};
--
2.1.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCHv0 2/2] arm: mvebu: normalize pinctrl entries for Armada SoCs
2014-11-22 16:19 [PATCHv0 0/2] arm: mvebu: fixes for previous DS213j/DS414 series Arnaud Ebalard
2014-11-22 16:19 ` [PATCHv0 1/2] arm: mvebu: fix wrongly named DS414 pinctrl entries Arnaud Ebalard
@ 2014-11-22 16:23 ` Arnaud Ebalard
2014-11-24 19:04 ` [PATCHv0 0/2] arm: mvebu: fixes for previous DS213j/DS414 series Arnaud Ebalard
2014-11-26 4:12 ` Jason Cooper
3 siblings, 0 replies; 6+ messages in thread
From: Arnaud Ebalard @ 2014-11-22 16:23 UTC (permalink / raw)
To: linux-arm-kernel
There are currently 2 differents naming conventions used between the
existing Armada SoC DT files for pinctrl entries (*_pin(s): *-pin(s)
and pmx_*: pmx-*) with a vast majority of files using the former:
$ grep _pin arch/arm/boot/dts/armada-*.dts* | wc -l
155
$ grep pmx arch/arm/boot/dts/armada-*.dts* | wc -l
13
In fact, only some Armada XP files are using the second variant.
This patch normalizes those files (mainly ge0/1 entries) to use
the first variant.
Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
---
arch/arm/boot/dts/armada-xp-axpwifiap.dts | 12 ++++++------
arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 4 ++--
arch/arm/boot/dts/armada-xp-synology-ds414.dts | 4 ++--
arch/arm/boot/dts/armada-xp.dtsi | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index c9d25bdbe795..ba7ef9a2a904 100644
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -84,14 +84,14 @@
};
ethernet at 70000 {
- pinctrl-0 = <&pmx_ge0_rgmii>;
+ pinctrl-0 = <&ge0_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
};
ethernet at 74000 {
- pinctrl-0 = <&pmx_ge1_rgmii>;
+ pinctrl-0 = <&ge1_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy1>;
@@ -116,7 +116,7 @@
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
- pinctrl-0 = <&pmx_keys>;
+ pinctrl-0 = <&keys_pin>;
pinctrl-names = "default";
button at 1 {
@@ -128,15 +128,15 @@
};
&pinctrl {
- pinctrl-0 = <&pmx_phy_int>;
+ pinctrl-0 = <&phy_int_pin>;
pinctrl-names = "default";
- pmx_keys: pmx-keys {
+ keys_pin: keys-pin {
marvell,pins = "mpp33";
marvell,function = "gpio";
};
- pmx_phy_int: pmx-phy-int {
+ phy_int_pin: phy-int-pin {
marvell,pins = "mpp32";
marvell,function = "gpio";
};
diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
index 088d8d2fe9eb..a2ef93c1eb10 100644
--- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
+++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@ -66,7 +66,7 @@
};
ethernet at 70000 {
- pinctrl-0 = <&pmx_ge0_rgmii>;
+ pinctrl-0 = <&ge0_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy0>;
@@ -74,7 +74,7 @@
};
ethernet at 74000 {
- pinctrl-0 = <&pmx_ge1_rgmii>;
+ pinctrl-0 = <&ge1_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy1>;
diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
index 97cbf980c54d..749fdba5a642 100644
--- a/arch/arm/boot/dts/armada-xp-synology-ds414.dts
+++ b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
@@ -184,14 +184,14 @@
ethernet at 70000 {
status = "okay";
- pinctrl-0 = <&pmx_ge0_rgmii>;
+ pinctrl-0 = <&ge0_rgmii_pins>;
pinctrl-names = "default";
phy = <&phy1>;
phy-mode = "rgmii-id";
};
ethernet at 74000 {
- pinctrl-0 = <&pmx_ge1_rgmii>;
+ pinctrl-0 = <&ge1_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy0>;
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index bdb36a05c039..a2a6451524dc 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -212,7 +212,7 @@
};
&pinctrl {
- pmx_ge0_gmii: pmx-ge0-gmii {
+ ge0_gmii_pins: ge0-gmii-pins {
marvell,pins =
"mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp6", "mpp7",
@@ -223,7 +223,7 @@
marvell,function = "ge0";
};
- pmx_ge0_rgmii: pmx-ge0-rgmii {
+ ge0_rgmii_pins: ge0-rgmii-pins {
marvell,pins =
"mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp6", "mpp7",
@@ -231,7 +231,7 @@
marvell,function = "ge0";
};
- pmx_ge1_rgmii: pmx-ge1-rgmii {
+ ge1_rgmii_pins: ge1-rgmii-pins {
marvell,pins =
"mpp12", "mpp13", "mpp14", "mpp15",
"mpp16", "mpp17", "mpp18", "mpp19",
--
2.1.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCHv0 0/2] arm: mvebu: fixes for previous DS213j/DS414 series
2014-11-22 16:19 [PATCHv0 0/2] arm: mvebu: fixes for previous DS213j/DS414 series Arnaud Ebalard
` (2 preceding siblings ...)
2014-11-24 19:04 ` [PATCHv0 0/2] arm: mvebu: fixes for previous DS213j/DS414 series Arnaud Ebalard
@ 2014-11-26 4:12 ` Jason Cooper
2014-11-26 18:10 ` Arnaud Ebalard
3 siblings, 1 reply; 6+ messages in thread
From: Jason Cooper @ 2014-11-26 4:12 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Nov 22, 2014 at 05:19:21PM +0100, Arnaud Ebalard wrote:
> Hi Jason,
>
> This series contains two patches. I spent some time reading the patches
> of my previous series you had to manually apply. I only noticed the error
> Ben reported on v6 (i.e. some pinctrl entries still using pmx_ instead
> of _pins) which patch 1 corrects.
>
> Regarding the second patch, having forgotten to enable MACH_ARMADA_XP in
> my kernel config, I missed a renaming of ge0/1 pinctrl entries in
> armada-xp.dtsi, which resulted in a non-compiling .dts file for DS414.
> To fix my mistake, you did a s/ge[01]_rgmii_pins/pmx_ge[01]_rgmii/,
> reintroducing some of the pmx_ naming that should have been removed in
> the process. So, the second patch in that series finishes the work to
> normalize pinctrl entries in Armada SoCs DT files.
>
> The patches do apply on your mvebu/dt branch. They do pass a whole
> compilation (including 'make dtbs') and I can boot a resulting kernel on
> my DS213j. I do not have a DS414 at hand but will test on this device
> early next week.
>
> I hope eveyhting is now back in order w/ those. Feedback appreciated.
>
> Cheers,
>
> a+
>
> Arnaud Ebalard (2):
> arm: mvebu: fix wrongly named DS414 pinctrl entries
> arm: mvebu: normalize pinctrl entries for Armada SoCs
>
> arch/arm/boot/dts/armada-xp-axpwifiap.dts | 12 ++++++------
> arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 4 ++--
> arch/arm/boot/dts/armada-xp-synology-ds414.dts | 10 +++++-----
> arch/arm/boot/dts/armada-xp.dtsi | 6 +++---
> 4 files changed, 16 insertions(+), 16 deletions(-)
Thanks for taking care of this. Applied to mvebu/dt
thx,
Jason.
^ permalink raw reply [flat|nested] 6+ messages in thread