aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-05-24 05:44:45 -0400
committerJason Cooper <jason@lakedaemon.net>2013-05-27 11:32:08 -0400
commit40eb44176d6159007f34d24cfe526b2d99c7ced7 (patch)
treefcbedcbedc8ac360c02a846e7107df732797fe46
parentdf483efaa2b626a05115f453e2b35a2d66096d33 (diff)
arm: kirkwood: iconnect: give meaningful names to pinmux configs
The Kirkwood iConnect Device Tree is currently using totally meaningless names for the pinmux configuration: pmx_gpio_XY. This patch fixes that by using some more meaningful names such as pmx_button_power. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/boot/dts/kirkwood-iconnect.dts30
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index 12ccf74ac3c4..20c3ece119c8 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -21,50 +21,50 @@
21 ocp@f1000000 { 21 ocp@f1000000 {
22 pinctrl: pinctrl@10000 { 22 pinctrl: pinctrl@10000 {
23 23
24 pinctrl-0 = < &pmx_gpio_12 &pmx_gpio_35 24 pinctrl-0 = < &pmx_button_reset &pmx_button_otb
25 &pmx_gpio_41 &pmx_gpio_42 25 &pmx_led_level &pmx_led_power_blue
26 &pmx_gpio_43 &pmx_gpio_44 26 &pmx_led_power_red &pmx_led_usb1
27 &pmx_gpio_45 &pmx_gpio_46 27 &pmx_led_usb2 &pmx_led_usb3
28 &pmx_gpio_47 &pmx_gpio_48 >; 28 &pmx_led_usb4 &pmx_led_otb >;
29 pinctrl-names = "default"; 29 pinctrl-names = "default";
30 30
31 pmx_gpio_12: pmx-gpio-12 { 31 pmx_button_reset: pmx-button-reset {
32 marvell,pins = "mpp12"; 32 marvell,pins = "mpp12";
33 marvell,function = "gpio"; 33 marvell,function = "gpio";
34 }; 34 };
35 pmx_gpio_35: pmx-gpio-35 { 35 pmx_button_otb: pmx-button-otb {
36 marvell,pins = "mpp35"; 36 marvell,pins = "mpp35";
37 marvell,function = "gpio"; 37 marvell,function = "gpio";
38 }; 38 };
39 pmx_gpio_41: pmx-gpio-41 { 39 pmx_led_level: pmx-led-level {
40 marvell,pins = "mpp41"; 40 marvell,pins = "mpp41";
41 marvell,function = "gpio"; 41 marvell,function = "gpio";
42 }; 42 };
43 pmx_gpio_42: pmx-gpio-42 { 43 pmx_led_power_blue: pmx-led-power-blue {
44 marvell,pins = "mpp42"; 44 marvell,pins = "mpp42";
45 marvell,function = "gpio"; 45 marvell,function = "gpio";
46 }; 46 };
47 pmx_gpio_43: pmx-gpio-43 { 47 pmx_led_power_red: pmx-power-red {
48 marvell,pins = "mpp43"; 48 marvell,pins = "mpp43";
49 marvell,function = "gpio"; 49 marvell,function = "gpio";
50 }; 50 };
51 pmx_gpio_44: pmx-gpio-44 { 51 pmx_led_usb1: pmx-led-usb1 {
52 marvell,pins = "mpp44"; 52 marvell,pins = "mpp44";
53 marvell,function = "gpio"; 53 marvell,function = "gpio";
54 }; 54 };
55 pmx_gpio_45: pmx-gpio-45 { 55 pmx_led_usb2: pmx-led-usb2 {
56 marvell,pins = "mpp45"; 56 marvell,pins = "mpp45";
57 marvell,function = "gpio"; 57 marvell,function = "gpio";
58 }; 58 };
59 pmx_gpio_46: pmx-gpio-46 { 59 pmx_led_usb3: pmx-led-usb3 {
60 marvell,pins = "mpp46"; 60 marvell,pins = "mpp46";
61 marvell,function = "gpio"; 61 marvell,function = "gpio";
62 }; 62 };
63 pmx_gpio_47: pmx-gpio-47 { 63 pmx_led_usb4: pmx-led-usb4 {
64 marvell,pins = "mpp47"; 64 marvell,pins = "mpp47";
65 marvell,function = "gpio"; 65 marvell,function = "gpio";
66 }; 66 };
67 pmx_gpio_48: pmx-gpio-48 { 67 pmx_led_otb: pmx-led-otb {
68 marvell,pins = "mpp48"; 68 marvell,pins = "mpp48";
69 marvell,function = "gpio"; 69 marvell,function = "gpio";
70 }; 70 };