p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

arm: mvebu: normalize pinctrl entries for Armada SoCs 

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>
Link: https://lkml.kernel.org/r/00114c3169e1d93259ff4150ed46ee36eae16b1e.1416670812.git.arno@natisbad.org
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Arnaud Ebalard 2014-11-22 17:23:30 +01:00 committed by Jason Cooper
parent a02fe64522
commit 70ee4e9d9f
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/boot/dts/armada-xp-axpwifiap.dts
View File

@ -84,14 +84,14 @@ phy1: ethernet-phy@1 {
};
ethernet@70000 {
pinctrl-0 = <&pmx_ge0_rgmii>;
pinctrl-0 = <&ge0_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
};
ethernet@74000 {
pinctrl-0 = <&pmx_ge1_rgmii>;
pinctrl-0 = <&ge1_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy1>;
@ -116,7 +116,7 @@ gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&pmx_keys>;
pinctrl-0 = <&keys_pin>;
pinctrl-names = "default";
button@1 {
@ -128,15 +128,15 @@ button@1 {
};
&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";
};

4
arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
View File

@ -66,7 +66,7 @@ phy1: ethernet-phy@1 { /* Marvell 88E1318 */
};
ethernet@70000 {
pinctrl-0 = <&pmx_ge0_rgmii>;
pinctrl-0 = <&ge0_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy0>;
@ -74,7 +74,7 @@ ethernet@70000 {
};
ethernet@74000 {
pinctrl-0 = <&pmx_ge1_rgmii>;
pinctrl-0 = <&ge1_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy1>;

4
arch/arm/boot/dts/armada-xp-synology-ds414.dts
View File

@ -184,14 +184,14 @@ phy1: ethernet-phy@1 { /* Marvell 88E1512 */
ethernet@70000 {
status = "okay";
pinctrl-0 = <&pmx_ge0_rgmii>;
pinctrl-0 = <&ge0_rgmii_pins>;
pinctrl-names = "default";
phy = <&phy1>;
phy-mode = "rgmii-id";
};
ethernet@74000 {
pinctrl-0 = <&pmx_ge1_rgmii>;
pinctrl-0 = <&ge1_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy0>;

6
arch/arm/boot/dts/armada-xp.dtsi
View File

@ -212,7 +212,7 @@ refclk: oscillator {
};
&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 @@ pmx_ge0_gmii: pmx-ge0-gmii {
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 @@ pmx_ge0_rgmii: pmx-ge0-rgmii {
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",