diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2013-11-19 06:47:27 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2014-02-09 08:32:51 -0500 |
commit | bdb3eec7a77fb332d7f1f18581a7a5e372ce7644 (patch) | |
tree | 6a9d7d8ea2f7858311f867a83568f83f2294a21d /arch/arm/boot | |
parent | 4e942303eaa10872ca77bbaa054accd3e4bebdbb (diff) |
ARM: dts: i.MX51 boards: Switch to use standard GPIO flags definitions
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/imx51-apf51.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx51-apf51dev.dts | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx51-babbage.dts | 11 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx51.dtsi | 1 |
4 files changed, 15 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/imx51-apf51.dts b/arch/arm/boot/dts/imx51-apf51.dts index 58ccf447e122..e88b2a6be079 100644 --- a/arch/arm/boot/dts/imx51-apf51.dts +++ b/arch/arm/boot/dts/imx51-apf51.dts | |||
@@ -36,7 +36,7 @@ | |||
36 | pinctrl-names = "default"; | 36 | pinctrl-names = "default"; |
37 | pinctrl-0 = <&pinctrl_fec>; | 37 | pinctrl-0 = <&pinctrl_fec>; |
38 | phy-mode = "mii"; | 38 | phy-mode = "mii"; |
39 | phy-reset-gpios = <&gpio3 0 0>; | 39 | phy-reset-gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>; |
40 | phy-reset-duration = <1>; | 40 | phy-reset-duration = <1>; |
41 | status = "okay"; | 41 | status = "okay"; |
42 | }; | 42 | }; |
diff --git a/arch/arm/boot/dts/imx51-apf51dev.dts b/arch/arm/boot/dts/imx51-apf51dev.dts index 23e0058a89e4..c29cfa927c98 100644 --- a/arch/arm/boot/dts/imx51-apf51dev.dts +++ b/arch/arm/boot/dts/imx51-apf51dev.dts | |||
@@ -48,7 +48,7 @@ | |||
48 | 48 | ||
49 | user-key { | 49 | user-key { |
50 | label = "user"; | 50 | label = "user"; |
51 | gpios = <&gpio1 3 0>; | 51 | gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; |
52 | linux,code = <256>; /* BTN_0 */ | 52 | linux,code = <256>; /* BTN_0 */ |
53 | }; | 53 | }; |
54 | }; | 54 | }; |
@@ -58,7 +58,7 @@ | |||
58 | 58 | ||
59 | user { | 59 | user { |
60 | label = "Heartbeat"; | 60 | label = "Heartbeat"; |
61 | gpios = <&gpio1 2 0>; | 61 | gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; |
62 | linux,default-trigger = "heartbeat"; | 62 | linux,default-trigger = "heartbeat"; |
63 | }; | 63 | }; |
64 | }; | 64 | }; |
@@ -68,7 +68,8 @@ | |||
68 | pinctrl-names = "default"; | 68 | pinctrl-names = "default"; |
69 | pinctrl-0 = <&pinctrl_ecspi1>; | 69 | pinctrl-0 = <&pinctrl_ecspi1>; |
70 | fsl,spi-num-chipselects = <2>; | 70 | fsl,spi-num-chipselects = <2>; |
71 | cs-gpios = <&gpio4 24 0>, <&gpio4 25 0>; | 71 | cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>, |
72 | <&gpio4 25 GPIO_ACTIVE_HIGH>; | ||
72 | status = "okay"; | 73 | status = "okay"; |
73 | }; | 74 | }; |
74 | 75 | ||
@@ -76,14 +77,15 @@ | |||
76 | pinctrl-names = "default"; | 77 | pinctrl-names = "default"; |
77 | pinctrl-0 = <&pinctrl_ecspi2>; | 78 | pinctrl-0 = <&pinctrl_ecspi2>; |
78 | fsl,spi-num-chipselects = <2>; | 79 | fsl,spi-num-chipselects = <2>; |
79 | cs-gpios = <&gpio3 28 1>, <&gpio3 27 1>; | 80 | cs-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>, |
81 | <&gpio3 27 GPIO_ACTIVE_LOW>; | ||
80 | status = "okay"; | 82 | status = "okay"; |
81 | }; | 83 | }; |
82 | 84 | ||
83 | &esdhc1 { | 85 | &esdhc1 { |
84 | pinctrl-names = "default"; | 86 | pinctrl-names = "default"; |
85 | pinctrl-0 = <&pinctrl_esdhc1>; | 87 | pinctrl-0 = <&pinctrl_esdhc1>; |
86 | cd-gpios = <&gpio2 29 0>; | 88 | cd-gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>; |
87 | bus-width = <4>; | 89 | bus-width = <4>; |
88 | status = "okay"; | 90 | status = "okay"; |
89 | }; | 91 | }; |
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts index 7981e357064a..d3ceabb856c7 100644 --- a/arch/arm/boot/dts/imx51-babbage.dts +++ b/arch/arm/boot/dts/imx51-babbage.dts | |||
@@ -75,7 +75,7 @@ | |||
75 | 75 | ||
76 | power { | 76 | power { |
77 | label = "Power Button"; | 77 | label = "Power Button"; |
78 | gpios = <&gpio2 21 0>; | 78 | gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>; |
79 | linux,code = <116>; /* KEY_POWER */ | 79 | linux,code = <116>; /* KEY_POWER */ |
80 | gpio-key,wakeup; | 80 | gpio-key,wakeup; |
81 | }; | 81 | }; |
@@ -105,7 +105,7 @@ | |||
105 | reg=<0>; | 105 | reg=<0>; |
106 | #clock-cells = <0>; | 106 | #clock-cells = <0>; |
107 | clock-frequency = <26000000>; | 107 | clock-frequency = <26000000>; |
108 | gpios = <&gpio4 26 1>; | 108 | gpios = <&gpio4 26 GPIO_ACTIVE_LOW>; |
109 | }; | 109 | }; |
110 | }; | 110 | }; |
111 | }; | 111 | }; |
@@ -121,8 +121,8 @@ | |||
121 | &esdhc2 { | 121 | &esdhc2 { |
122 | pinctrl-names = "default"; | 122 | pinctrl-names = "default"; |
123 | pinctrl-0 = <&pinctrl_esdhc2>; | 123 | pinctrl-0 = <&pinctrl_esdhc2>; |
124 | cd-gpios = <&gpio1 6 0>; | 124 | cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; |
125 | wp-gpios = <&gpio1 5 0>; | 125 | wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; |
126 | status = "okay"; | 126 | status = "okay"; |
127 | }; | 127 | }; |
128 | 128 | ||
@@ -137,7 +137,8 @@ | |||
137 | pinctrl-names = "default"; | 137 | pinctrl-names = "default"; |
138 | pinctrl-0 = <&pinctrl_ecspi1>; | 138 | pinctrl-0 = <&pinctrl_ecspi1>; |
139 | fsl,spi-num-chipselects = <2>; | 139 | fsl,spi-num-chipselects = <2>; |
140 | cs-gpios = <&gpio4 24 0>, <&gpio4 25 0>; | 140 | cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>, |
141 | <&gpio4 25 GPIO_ACTIVE_HIGH>; | ||
141 | status = "okay"; | 142 | status = "okay"; |
142 | 143 | ||
143 | pmic: mc13892@0 { | 144 | pmic: mc13892@0 { |
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index f264cab1b7c1..f10d213093ec 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi | |||
@@ -14,6 +14,7 @@ | |||
14 | #include "imx51-pinfunc.h" | 14 | #include "imx51-pinfunc.h" |
15 | #include <dt-bindings/interrupt-controller/irq.h> | 15 | #include <dt-bindings/interrupt-controller/irq.h> |
16 | #include <dt-bindings/clock/imx5-clock.h> | 16 | #include <dt-bindings/clock/imx5-clock.h> |
17 | #include <dt-bindings/gpio/gpio.h> | ||
17 | 18 | ||
18 | / { | 19 | / { |
19 | aliases { | 20 | aliases { |