aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier@osg.samsung.com>2015-10-07 18:39:58 -0400
committerKukjin Kim <kgene@kernel.org>2015-10-07 18:39:58 -0400
commit39c1c413c1970803137d58ba25ea554f4f0fccea (patch)
treee5794f72b4114a9521a4a866e4f9e9e53fd2379f
parentde77e52d34269f25a33e231fe3c1431116776617 (diff)
ARM: dts: Use GPIO constants for flags cells in exynos4120 boards
The board DTS are using numeric values instead of the defined GPIO constanst to express polarity, use them to make the DTS more clear. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
Diffstat
-rw-r--r--arch/arm/boot/dts/exynos4210-origen.dts15
-rw-r--r--arch/arm/boot/dts/exynos4210-smdkv310.dts3
-rw-r--r--arch/arm/boot/dts/exynos4210-trats.dts29
-rw-r--r--arch/arm/boot/dts/exynos4210-universal_c210.dts42
4 files changed, 47 insertions, 42 deletions
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index e050d85cdacd..b8f866991bdd 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -16,6 +16,7 @@
16 16
17/dts-v1/; 17/dts-v1/;
18#include "exynos4210.dtsi" 18#include "exynos4210.dtsi"
19#include <dt-bindings/gpio/gpio.h>
19#include <dt-bindings/input/input.h> 20#include <dt-bindings/input/input.h>
20 21
21/ { 22/ {
@@ -45,7 +46,7 @@
45 regulator-name = "VMEM_VDD_2.8V"; 46 regulator-name = "VMEM_VDD_2.8V";
46 regulator-min-microvolt = <2800000>; 47 regulator-min-microvolt = <2800000>;
47 regulator-max-microvolt = <2800000>; 48 regulator-max-microvolt = <2800000>;
48 gpio = <&gpx1 1 0>; 49 gpio = <&gpx1 1 GPIO_ACTIVE_HIGH>;
49 enable-active-high; 50 enable-active-high;
50 }; 51 };
51 }; 52 };
@@ -57,35 +58,35 @@
57 58
58 up { 59 up {
59 label = "Up"; 60 label = "Up";
60 gpios = <&gpx2 0 1>; 61 gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;
61 linux,code = <KEY_UP>; 62 linux,code = <KEY_UP>;
62 gpio-key,wakeup; 63 gpio-key,wakeup;
63 }; 64 };
64 65
65 down { 66 down {
66 label = "Down"; 67 label = "Down";
67 gpios = <&gpx2 1 1>; 68 gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;
68 linux,code = <KEY_DOWN>; 69 linux,code = <KEY_DOWN>;
69 gpio-key,wakeup; 70 gpio-key,wakeup;
70 }; 71 };
71 72
72 back { 73 back {
73 label = "Back"; 74 label = "Back";
74 gpios = <&gpx1 7 1>; 75 gpios = <&gpx1 7 GPIO_ACTIVE_LOW>;
75 linux,code = <KEY_BACK>; 76 linux,code = <KEY_BACK>;
76 gpio-key,wakeup; 77 gpio-key,wakeup;
77 }; 78 };
78 79
79 home { 80 home {
80 label = "Home"; 81 label = "Home";
81 gpios = <&gpx1 6 1>; 82 gpios = <&gpx1 6 GPIO_ACTIVE_LOW>;
82 linux,code = <KEY_HOME>; 83 linux,code = <KEY_HOME>;
83 gpio-key,wakeup; 84 gpio-key,wakeup;
84 }; 85 };
85 86
86 menu { 87 menu {
87 label = "Menu"; 88 label = "Menu";
88 gpios = <&gpx1 5 1>; 89 gpios = <&gpx1 5 GPIO_ACTIVE_LOW>;
89 linux,code = <KEY_MENU>; 90 linux,code = <KEY_MENU>;
90 gpio-key,wakeup; 91 gpio-key,wakeup;
91 }; 92 };
@@ -94,7 +95,7 @@
94 leds { 95 leds {
95 compatible = "gpio-leds"; 96 compatible = "gpio-leds";
96 status { 97 status {
97 gpios = <&gpx1 3 1>; 98 gpios = <&gpx1 3 GPIO_ACTIVE_LOW>;
98 linux,default-trigger = "heartbeat"; 99 linux,default-trigger = "heartbeat";
99 }; 100 };
100 }; 101 };
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 043b03caff8f..bc1448ba95d3 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -16,6 +16,7 @@
16 16
17/dts-v1/; 17/dts-v1/;
18#include "exynos4210.dtsi" 18#include "exynos4210.dtsi"
19#include <dt-bindings/gpio/gpio.h>
19 20
20/ { 21/ {
21 model = "Samsung smdkv310 evaluation board based on Exynos4210"; 22 model = "Samsung smdkv310 evaluation board based on Exynos4210";
@@ -182,7 +183,7 @@
182}; 183};
183 184
184&spi_2 { 185&spi_2 {
185 cs-gpios = <&gpc1 2 0>; 186 cs-gpios = <&gpc1 2 GPIO_ACTIVE_HIGH>;
186 status = "okay"; 187 status = "okay";
187 188
188 w25x80@0 { 189 w25x80@0 {
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index ba34886f8b65..c69e468efd2e 100644
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -14,6 +14,7 @@
14 14
15/dts-v1/; 15/dts-v1/;
16#include "exynos4210.dtsi" 16#include "exynos4210.dtsi"
17#include <dt-bindings/gpio/gpio.h>
17 18
18/ { 19/ {
19 model = "Samsung Trats based on Exynos4210"; 20 model = "Samsung Trats based on Exynos4210";
@@ -39,7 +40,7 @@
39 regulator-name = "VMEM_VDD_2.8V"; 40 regulator-name = "VMEM_VDD_2.8V";
40 regulator-min-microvolt = <2800000>; 41 regulator-min-microvolt = <2800000>;
41 regulator-max-microvolt = <2800000>; 42 regulator-max-microvolt = <2800000>;
42 gpio = <&gpk0 2 0>; 43 gpio = <&gpk0 2 GPIO_ACTIVE_HIGH>;
43 enable-active-high; 44 enable-active-high;
44 }; 45 };
45 46
@@ -48,7 +49,7 @@
48 regulator-name = "TSP_FIXED_VOLTAGES"; 49 regulator-name = "TSP_FIXED_VOLTAGES";
49 regulator-min-microvolt = <2800000>; 50 regulator-min-microvolt = <2800000>;
50 regulator-max-microvolt = <2800000>; 51 regulator-max-microvolt = <2800000>;
51 gpio = <&gpl0 3 0>; 52 gpio = <&gpl0 3 GPIO_ACTIVE_HIGH>;
52 enable-active-high; 53 enable-active-high;
53 }; 54 };
54 55
@@ -57,7 +58,7 @@
57 regulator-name = "8M_AF_2.8V_EN"; 58 regulator-name = "8M_AF_2.8V_EN";
58 regulator-min-microvolt = <2800000>; 59 regulator-min-microvolt = <2800000>;
59 regulator-max-microvolt = <2800000>; 60 regulator-max-microvolt = <2800000>;
60 gpio = <&gpk1 1 0>; 61 gpio = <&gpk1 1 GPIO_ACTIVE_HIGH>;
61 enable-active-high; 62 enable-active-high;
62 }; 63 };
63 64
@@ -66,7 +67,7 @@
66 regulator-name = "CAM_IO_EN"; 67 regulator-name = "CAM_IO_EN";
67 regulator-min-microvolt = <2800000>; 68 regulator-min-microvolt = <2800000>;
68 regulator-max-microvolt = <2800000>; 69 regulator-max-microvolt = <2800000>;
69 gpio = <&gpe2 1 0>; 70 gpio = <&gpe2 1 GPIO_ACTIVE_HIGH>;
70 enable-active-high; 71 enable-active-high;
71 }; 72 };
72 73
@@ -75,7 +76,7 @@
75 regulator-name = "8M_1.2V_EN"; 76 regulator-name = "8M_1.2V_EN";
76 regulator-min-microvolt = <1200000>; 77 regulator-min-microvolt = <1200000>;
77 regulator-max-microvolt = <1200000>; 78 regulator-max-microvolt = <1200000>;
78 gpio = <&gpe2 5 0>; 79 gpio = <&gpe2 5 GPIO_ACTIVE_HIGH>;
79 enable-active-high; 80 enable-active-high;
80 }; 81 };
81 82
@@ -84,7 +85,7 @@
84 regulator-name = "VT_CORE_1.5V"; 85 regulator-name = "VT_CORE_1.5V";
85 regulator-min-microvolt = <1500000>; 86 regulator-min-microvolt = <1500000>;
86 regulator-max-microvolt = <1500000>; 87 regulator-max-microvolt = <1500000>;
87 gpio = <&gpe2 2 0>; 88 gpio = <&gpe2 2 GPIO_ACTIVE_HIGH>;
88 enable-active-high; 89 enable-active-high;
89 }; 90 };
90 }; 91 };
@@ -93,21 +94,21 @@
93 compatible = "gpio-keys"; 94 compatible = "gpio-keys";
94 95
95 vol-down-key { 96 vol-down-key {
96 gpios = <&gpx2 1 1>; 97 gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;
97 linux,code = <114>; 98 linux,code = <114>;
98 label = "volume down"; 99 label = "volume down";
99 debounce-interval = <10>; 100 debounce-interval = <10>;
100 }; 101 };
101 102
102 vol-up-key { 103 vol-up-key {
103 gpios = <&gpx2 0 1>; 104 gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;
104 linux,code = <115>; 105 linux,code = <115>;
105 label = "volume up"; 106 label = "volume up";
106 debounce-interval = <10>; 107 debounce-interval = <10>;
107 }; 108 };
108 109
109 power-key { 110 power-key {
110 gpios = <&gpx2 7 1>; 111 gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
111 linux,code = <116>; 112 linux,code = <116>;
112 label = "power"; 113 label = "power";
113 debounce-interval = <10>; 114 debounce-interval = <10>;
@@ -115,7 +116,7 @@
115 }; 116 };
116 117
117 ok-key { 118 ok-key {
118 gpios = <&gpx3 5 1>; 119 gpios = <&gpx3 5 GPIO_ACTIVE_LOW>;
119 linux,code = <352>; 120 linux,code = <352>;
120 label = "ok"; 121 label = "ok";
121 debounce-interval = <10>; 122 debounce-interval = <10>;
@@ -218,7 +219,7 @@
218 compatible = "samsung,s6e8aa0"; 219 compatible = "samsung,s6e8aa0";
219 vdd3-supply = <&vcclcd_reg>; 220 vdd3-supply = <&vcclcd_reg>;
220 vci-supply = <&vlcd_reg>; 221 vci-supply = <&vlcd_reg>;
221 reset-gpios = <&gpy4 5 0>; 222 reset-gpios = <&gpy4 5 GPIO_ACTIVE_HIGH>;
222 power-on-delay= <50>; 223 power-on-delay= <50>;
223 reset-delay = <100>; 224 reset-delay = <100>;
224 init-delay = <100>; 225 init-delay = <100>;
@@ -304,9 +305,9 @@
304 max8997,pmic-ignore-gpiodvs-side-effect; 305 max8997,pmic-ignore-gpiodvs-side-effect;
305 max8997,pmic-buck125-default-dvs-idx = <0>; 306 max8997,pmic-buck125-default-dvs-idx = <0>;
306 307
307 max8997,pmic-buck125-dvs-gpios = <&gpx0 5 0>, 308 max8997,pmic-buck125-dvs-gpios = <&gpx0 5 GPIO_ACTIVE_HIGH>,
308 <&gpx0 6 0>, 309 <&gpx0 6 GPIO_ACTIVE_HIGH>,
309 <&gpl0 0 0>; 310 <&gpl0 0 GPIO_ACTIVE_HIGH>;
310 311
311 max8997,pmic-buck1-dvs-voltage = <1350000>, <1300000>, 312 max8997,pmic-buck1-dvs-voltage = <1350000>, <1300000>,
312 <1250000>, <1200000>, 313 <1250000>, <1200000>,
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index eb379526e234..896be8f2342d 100644
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -14,6 +14,7 @@
14 14
15/dts-v1/; 15/dts-v1/;
16#include "exynos4210.dtsi" 16#include "exynos4210.dtsi"
17#include <dt-bindings/gpio/gpio.h>
17 18
18/ { 19/ {
19 model = "Samsung Universal C210 based on Exynos4210 rev0"; 20 model = "Samsung Universal C210 based on Exynos4210 rev0";
@@ -65,7 +66,7 @@
65 regulator-name = "VMEM_VDD_2_8V"; 66 regulator-name = "VMEM_VDD_2_8V";
66 regulator-min-microvolt = <2800000>; 67 regulator-min-microvolt = <2800000>;
67 regulator-max-microvolt = <2800000>; 68 regulator-max-microvolt = <2800000>;
68 gpio = <&gpe1 3 0>; 69 gpio = <&gpe1 3 GPIO_ACTIVE_HIGH>;
69 enable-active-high; 70 enable-active-high;
70 }; 71 };
71 72
@@ -73,21 +74,21 @@
73 compatible = "gpio-keys"; 74 compatible = "gpio-keys";
74 75
75 vol-up-key { 76 vol-up-key {
76 gpios = <&gpx2 0 1>; 77 gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;
77 linux,code = <115>; 78 linux,code = <115>;
78 label = "volume up"; 79 label = "volume up";
79 debounce-interval = <1>; 80 debounce-interval = <1>;
80 }; 81 };
81 82
82 vol-down-key { 83 vol-down-key {
83 gpios = <&gpx2 1 1>; 84 gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;
84 linux,code = <114>; 85 linux,code = <114>;
85 label = "volume down"; 86 label = "volume down";
86 debounce-interval = <1>; 87 debounce-interval = <1>;
87 }; 88 };
88 89
89 config-key { 90 config-key {
90 gpios = <&gpx2 2 1>; 91 gpios = <&gpx2 2 GPIO_ACTIVE_LOW>;
91 linux,code = <171>; 92 linux,code = <171>;
92 label = "config"; 93 label = "config";
93 debounce-interval = <1>; 94 debounce-interval = <1>;
@@ -95,14 +96,14 @@
95 }; 96 };
96 97
97 camera-key { 98 camera-key {
98 gpios = <&gpx2 3 1>; 99 gpios = <&gpx2 3 GPIO_ACTIVE_LOW>;
99 linux,code = <212>; 100 linux,code = <212>;
100 label = "camera"; 101 label = "camera";
101 debounce-interval = <1>; 102 debounce-interval = <1>;
102 }; 103 };
103 104
104 power-key { 105 power-key {
105 gpios = <&gpx2 7 1>; 106 gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
106 linux,code = <116>; 107 linux,code = <116>;
107 label = "power"; 108 label = "power";
108 debounce-interval = <1>; 109 debounce-interval = <1>;
@@ -110,7 +111,7 @@
110 }; 111 };
111 112
112 ok-key { 113 ok-key {
113 gpios = <&gpx3 5 1>; 114 gpios = <&gpx3 5 GPIO_ACTIVE_LOW>;
114 linux,code = <352>; 115 linux,code = <352>;
115 label = "ok"; 116 label = "ok";
116 debounce-interval = <1>; 117 debounce-interval = <1>;
@@ -122,7 +123,7 @@
122 regulator-name = "TSP_2_8V"; 123 regulator-name = "TSP_2_8V";
123 regulator-min-microvolt = <2800000>; 124 regulator-min-microvolt = <2800000>;
124 regulator-max-microvolt = <2800000>; 125 regulator-max-microvolt = <2800000>;
125 gpio = <&gpe2 3 0>; 126 gpio = <&gpe2 3 GPIO_ACTIVE_HIGH>;
126 enable-active-high; 127 enable-active-high;
127 }; 128 };
128 129
@@ -131,17 +132,17 @@
131 #address-cells = <1>; 132 #address-cells = <1>;
132 #size-cells = <0>; 133 #size-cells = <0>;
133 134
134 gpio-sck = <&gpy3 1 0>; 135 gpio-sck = <&gpy3 1 GPIO_ACTIVE_HIGH>;
135 gpio-mosi = <&gpy3 3 0>; 136 gpio-mosi = <&gpy3 3 GPIO_ACTIVE_HIGH>;
136 num-chipselects = <1>; 137 num-chipselects = <1>;
137 cs-gpios = <&gpy4 3 0>; 138 cs-gpios = <&gpy4 3 GPIO_ACTIVE_HIGH>;
138 139
139 lcd@0 { 140 lcd@0 {
140 compatible = "samsung,ld9040"; 141 compatible = "samsung,ld9040";
141 reg = <0>; 142 reg = <0>;
142 vdd3-supply = <&ldo7_reg>; 143 vdd3-supply = <&ldo7_reg>;
143 vci-supply = <&ldo17_reg>; 144 vci-supply = <&ldo17_reg>;
144 reset-gpios = <&gpy4 5 0>; 145 reset-gpios = <&gpy4 5 GPIO_ACTIVE_HIGH>;
145 spi-max-frequency = <1200000>; 146 spi-max-frequency = <1200000>;
146 spi-cpol; 147 spi-cpol;
147 spi-cpha; 148 spi-cpha;
@@ -218,13 +219,13 @@
218 regulator-name = "HDMI_5V"; 219 regulator-name = "HDMI_5V";
219 regulator-min-microvolt = <5000000>; 220 regulator-min-microvolt = <5000000>;
220 regulator-max-microvolt = <5000000>; 221 regulator-max-microvolt = <5000000>;
221 gpio = <&gpe0 1 0>; 222 gpio = <&gpe0 1 GPIO_ACTIVE_HIGH>;
222 enable-active-high; 223 enable-active-high;
223 }; 224 };
224 225
225 hdmi_ddc: i2c-ddc { 226 hdmi_ddc: i2c-ddc {
226 compatible = "i2c-gpio"; 227 compatible = "i2c-gpio";
227 gpios = <&gpe4 2 0 &gpe4 3 0>; 228 gpios = <&gpe4 2 GPIO_ACTIVE_HIGH &gpe4 3 GPIO_ACTIVE_HIGH>;
228 i2c-gpio,delay-us = <100>; 229 i2c-gpio,delay-us = <100>;
229 #address-cells = <1>; 230 #address-cells = <1>;
230 #size-cells = <0>; 231 #size-cells = <0>;
@@ -267,7 +268,7 @@
267}; 268};
268 269
269&hdmi { 270&hdmi {
270 hpd-gpio = <&gpx3 7 0>; 271 hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
271 pinctrl-names = "default"; 272 pinctrl-names = "default";
272 pinctrl-0 = <&hdmi_hpd>; 273 pinctrl-0 = <&hdmi_hpd>;
273 hdmi-en-supply = <&hdmi_en>; 274 hdmi-en-supply = <&hdmi_en>;
@@ -311,7 +312,8 @@
311 compatible = "maxim,max8952"; 312 compatible = "maxim,max8952";
312 reg = <0x60>; 313 reg = <0x60>;
313 314
314 max8952,vid-gpios = <&gpx0 3 0>, <&gpx0 4 0>; 315 max8952,vid-gpios = <&gpx0 3 GPIO_ACTIVE_HIGH>,
316 <&gpx0 4 GPIO_ACTIVE_HIGH>;
315 max8952,default-mode = <0>; 317 max8952,default-mode = <0>;
316 max8952,dvs-mode-microvolt = <1250000>, <1200000>, 318 max8952,dvs-mode-microvolt = <1250000>, <1200000>,
317 <1050000>, <950000>; 319 <1050000>, <950000>;
@@ -330,13 +332,13 @@
330 reg = <0x66>; 332 reg = <0x66>;
331 333
332 max8998,pmic-buck1-default-dvs-idx = <0>; 334 max8998,pmic-buck1-default-dvs-idx = <0>;
333 max8998,pmic-buck1-dvs-gpios = <&gpx0 5 0>, 335 max8998,pmic-buck1-dvs-gpios = <&gpx0 5 GPIO_ACTIVE_HIGH>,
334 <&gpx0 6 0>; 336 <&gpx0 6 GPIO_ACTIVE_HIGH>;
335 max8998,pmic-buck1-dvs-voltage = <1100000>, <1000000>, 337 max8998,pmic-buck1-dvs-voltage = <1100000>, <1000000>,
336 <1100000>, <1000000>; 338 <1100000>, <1000000>;
337 339
338 max8998,pmic-buck2-default-dvs-idx = <0>; 340 max8998,pmic-buck2-default-dvs-idx = <0>;
339 max8998,pmic-buck2-dvs-gpio = <&gpe2 0 0>; 341 max8998,pmic-buck2-dvs-gpio = <&gpe2 0 GPIO_ACTIVE_HIGH>;
340 max8998,pmic-buck2-dvs-voltage = <1200000>, <1100000>; 342 max8998,pmic-buck2-dvs-voltage = <1200000>, <1100000>;
341 343
342 regulators { 344 regulators {
@@ -551,7 +553,7 @@
551 pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4>; 553 pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4>;
552 pinctrl-names = "default"; 554 pinctrl-names = "default";
553 vmmc-supply = <&ldo5_reg>; 555 vmmc-supply = <&ldo5_reg>;
554 cd-gpios = <&gpx3 4 0>; 556 cd-gpios = <&gpx3 4 GPIO_ACTIVE_HIGH>;
555 cd-inverted; 557 cd-inverted;
556 status = "okay"; 558 status = "okay";
557}; 559};
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-23 11:29:47 -0400