summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/armada-xp-synology-ds414.dts
diff options
context:
space:
mode:
authorArnaud Ebalard <arno@natisbad.org>2014-11-22 17:23:30 +0100
committerJason Cooper <jason@lakedaemon.net>2014-11-26 04:05:05 +0000
commit70ee4e9d9f054e258480fd51c90cfc2b72be8b78 (patch)
tree105e3c29a66d2882693b734318b1eecb453f47a3 /arch/arm/boot/dts/armada-xp-synology-ds414.dts
parenta02fe6452202f1005a69f1310cc322630f68f3ae (diff)
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-synology-ds414.dts')
-rw-r--r--arch/arm/boot/dts/armada-xp-synology-ds414.dts4
1 files changed, 2 insertions, 2 deletions
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@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>;