diff options
| author | Arnaud Ebalard <arno@natisbad.org> | 2014-11-22 17:23:30 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-11-26 05:05:05 +0100 |
| commit | 70ee4e9d9f054e258480fd51c90cfc2b72be8b78 (patch) | |
| tree | 105e3c29a66d2882693b734318b1eecb453f47a3 /arch/arm/boot/dts/armada-xp-axpwifiap.dts | |
| parent | arm: mvebu: fix wrongly named DS414 pinctrl entries (diff) | |
| download | linux-70ee4e9d9f054e258480fd51c90cfc2b72be8b78.tar.xz linux-70ee4e9d9f054e258480fd51c90cfc2b72be8b78.zip | |
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>
Diffstat (limited to 'arch/arm/boot/dts/armada-xp-axpwifiap.dts')
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-axpwifiap.dts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts index c9d25bdbe795..ca0200e20751 100644 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts @@ -84,14 +84,14 @@ }; 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 @@ 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 @@ }; &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"; }; |