diff options
author | Krzysztof Kozlowski <krzk@kernel.org> | 2017-06-02 14:13:45 -0400 |
---|---|---|
committer | Krzysztof Kozlowski <krzk@kernel.org> | 2017-06-07 14:51:24 -0400 |
commit | 6ff0b90d746146f8270207551c0edbfe80986846 (patch) | |
tree | 8344d591a6de2c4553c3a64bec827c1a9364c9ec | |
parent | 5343b1579247875ccfa88778e8db17e181c9f3fe (diff) |
ARM: dts: exynos: Use human-friendly symbols for interrupt flags in board sources
Replace hard-coded values of interrupt flags with respective macros from
header to increase code readability.
Suggested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
-rw-r--r-- | arch/arm/boot/dts/exynos3250-monk.dts | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos3250-rinato.dts | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4210-origen.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4210-trats.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4412-odroidx.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4412-trats2.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 |
10 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts index cccfe4b791d1..accee81da266 100644 --- a/arch/arm/boot/dts/exynos3250-monk.dts +++ b/arch/arm/boot/dts/exynos3250-monk.dts | |||
@@ -67,7 +67,7 @@ | |||
67 | max77836: subpmic@25 { | 67 | max77836: subpmic@25 { |
68 | compatible = "maxim,max77836"; | 68 | compatible = "maxim,max77836"; |
69 | interrupt-parent = <&gpx1>; | 69 | interrupt-parent = <&gpx1>; |
70 | interrupts = <5 0>; | 70 | interrupts = <5 IRQ_TYPE_NONE>; |
71 | reg = <0x25>; | 71 | reg = <0x25>; |
72 | wakeup-source; | 72 | wakeup-source; |
73 | 73 | ||
@@ -191,7 +191,7 @@ | |||
191 | s2mps14_pmic@66 { | 191 | s2mps14_pmic@66 { |
192 | compatible = "samsung,s2mps14-pmic"; | 192 | compatible = "samsung,s2mps14-pmic"; |
193 | interrupt-parent = <&gpx0>; | 193 | interrupt-parent = <&gpx0>; |
194 | interrupts = <7 0>; | 194 | interrupts = <7 IRQ_TYPE_NONE>; |
195 | reg = <0x66>; | 195 | reg = <0x66>; |
196 | wakeup-source; | 196 | wakeup-source; |
197 | 197 | ||
@@ -414,7 +414,7 @@ | |||
414 | fuelgauge@36 { | 414 | fuelgauge@36 { |
415 | compatible = "maxim,max77836-battery"; | 415 | compatible = "maxim,max77836-battery"; |
416 | interrupt-parent = <&gpx1>; | 416 | interrupt-parent = <&gpx1>; |
417 | interrupts = <2 8>; | 417 | interrupts = <2 IRQ_TYPE_LEVEL_LOW>; |
418 | reg = <0x36>; | 418 | reg = <0x36>; |
419 | }; | 419 | }; |
420 | }; | 420 | }; |
diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts index c9f191ca7b9c..118235b72e90 100644 --- a/arch/arm/boot/dts/exynos3250-rinato.dts +++ b/arch/arm/boot/dts/exynos3250-rinato.dts | |||
@@ -58,7 +58,7 @@ | |||
58 | max77836: subpmic@25 { | 58 | max77836: subpmic@25 { |
59 | compatible = "maxim,max77836"; | 59 | compatible = "maxim,max77836"; |
60 | interrupt-parent = <&gpx1>; | 60 | interrupt-parent = <&gpx1>; |
61 | interrupts = <5 0>; | 61 | interrupts = <5 IRQ_TYPE_NONE>; |
62 | reg = <0x25>; | 62 | reg = <0x25>; |
63 | wakeup-source; | 63 | wakeup-source; |
64 | 64 | ||
@@ -295,7 +295,7 @@ | |||
295 | s2mps14_pmic@66 { | 295 | s2mps14_pmic@66 { |
296 | compatible = "samsung,s2mps14-pmic"; | 296 | compatible = "samsung,s2mps14-pmic"; |
297 | interrupt-parent = <&gpx0>; | 297 | interrupt-parent = <&gpx0>; |
298 | interrupts = <7 0>; | 298 | interrupts = <7 IRQ_TYPE_NONE>; |
299 | reg = <0x66>; | 299 | reg = <0x66>; |
300 | wakeup-source; | 300 | wakeup-source; |
301 | 301 | ||
@@ -626,7 +626,7 @@ | |||
626 | fuelgauge@36 { | 626 | fuelgauge@36 { |
627 | compatible = "maxim,max77836-battery"; | 627 | compatible = "maxim,max77836-battery"; |
628 | interrupt-parent = <&gpx1>; | 628 | interrupt-parent = <&gpx1>; |
629 | interrupts = <2 8>; | 629 | interrupts = <2 IRQ_TYPE_LEVEL_LOW>; |
630 | reg = <0x36>; | 630 | reg = <0x36>; |
631 | }; | 631 | }; |
632 | }; | 632 | }; |
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index 312650e2450f..084fcc5574ef 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts | |||
@@ -151,7 +151,7 @@ | |||
151 | compatible = "maxim,max8997-pmic"; | 151 | compatible = "maxim,max8997-pmic"; |
152 | reg = <0x66>; | 152 | reg = <0x66>; |
153 | interrupt-parent = <&gpx0>; | 153 | interrupt-parent = <&gpx0>; |
154 | interrupts = <4 0>, <3 0>; | 154 | interrupts = <4 IRQ_TYPE_NONE>, <3 IRQ_TYPE_NONE>; |
155 | 155 | ||
156 | max8997,pmic-buck1-dvs-voltage = <1350000>; | 156 | max8997,pmic-buck1-dvs-voltage = <1350000>; |
157 | max8997,pmic-buck2-dvs-voltage = <1100000>; | 157 | max8997,pmic-buck2-dvs-voltage = <1100000>; |
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts index 1743ca850070..645feffb9239 100644 --- a/arch/arm/boot/dts/exynos4210-trats.dts +++ b/arch/arm/boot/dts/exynos4210-trats.dts | |||
@@ -281,7 +281,7 @@ | |||
281 | compatible = "melfas,mms114"; | 281 | compatible = "melfas,mms114"; |
282 | reg = <0x48>; | 282 | reg = <0x48>; |
283 | interrupt-parent = <&gpx0>; | 283 | interrupt-parent = <&gpx0>; |
284 | interrupts = <4 2>; | 284 | interrupts = <4 IRQ_TYPE_EDGE_FALLING>; |
285 | x-size = <720>; | 285 | x-size = <720>; |
286 | y-size = <1280>; | 286 | y-size = <1280>; |
287 | avdd-supply = <&tsp_reg>; | 287 | avdd-supply = <&tsp_reg>; |
@@ -302,7 +302,7 @@ | |||
302 | 302 | ||
303 | reg = <0x66>; | 303 | reg = <0x66>; |
304 | interrupt-parent = <&gpx0>; | 304 | interrupt-parent = <&gpx0>; |
305 | interrupts = <7 0>; | 305 | interrupts = <7 IRQ_TYPE_NONE>; |
306 | 306 | ||
307 | max8997,pmic-buck1-uses-gpio-dvs; | 307 | max8997,pmic-buck1-uses-gpio-dvs; |
308 | max8997,pmic-buck2-uses-gpio-dvs; | 308 | max8997,pmic-buck2-uses-gpio-dvs; |
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi index 0f1ff792fe44..219d587c5a85 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | power_key { | 33 | power_key { |
34 | interrupt-parent = <&gpx1>; | 34 | interrupt-parent = <&gpx1>; |
35 | interrupts = <3 0>; | 35 | interrupts = <3 IRQ_TYPE_NONE>; |
36 | gpios = <&gpx1 3 GPIO_ACTIVE_LOW>; | 36 | gpios = <&gpx1 3 GPIO_ACTIVE_LOW>; |
37 | linux,code = <KEY_POWER>; | 37 | linux,code = <KEY_POWER>; |
38 | label = "power key"; | 38 | label = "power key"; |
@@ -266,7 +266,7 @@ | |||
266 | max77686: pmic@09 { | 266 | max77686: pmic@09 { |
267 | compatible = "maxim,max77686"; | 267 | compatible = "maxim,max77686"; |
268 | interrupt-parent = <&gpx3>; | 268 | interrupt-parent = <&gpx3>; |
269 | interrupts = <2 0>; | 269 | interrupts = <2 IRQ_TYPE_NONE>; |
270 | pinctrl-names = "default"; | 270 | pinctrl-names = "default"; |
271 | pinctrl-0 = <&max77686_irq>; | 271 | pinctrl-0 = <&max77686_irq>; |
272 | reg = <0x09>; | 272 | reg = <0x09>; |
@@ -484,7 +484,7 @@ | |||
484 | compatible = "maxim,max98090"; | 484 | compatible = "maxim,max98090"; |
485 | reg = <0x10>; | 485 | reg = <0x10>; |
486 | interrupt-parent = <&gpx0>; | 486 | interrupt-parent = <&gpx0>; |
487 | interrupts = <0 0>; | 487 | interrupts = <0 IRQ_TYPE_NONE>; |
488 | clocks = <&i2s0 CLK_I2S_CDCLK>; | 488 | clocks = <&i2s0 CLK_I2S_CDCLK>; |
489 | clock-names = "mclk"; | 489 | clock-names = "mclk"; |
490 | #sound-dai-cells = <0>; | 490 | #sound-dai-cells = <0>; |
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts index 46b931eec228..97882267ef09 100644 --- a/arch/arm/boot/dts/exynos4412-odroidx.dts +++ b/arch/arm/boot/dts/exynos4412-odroidx.dts | |||
@@ -44,7 +44,7 @@ | |||
44 | 44 | ||
45 | home_key { | 45 | home_key { |
46 | interrupt-parent = <&gpx2>; | 46 | interrupt-parent = <&gpx2>; |
47 | interrupts = <2 0>; | 47 | interrupts = <2 IRQ_TYPE_NONE>; |
48 | gpios = <&gpx2 2 GPIO_ACTIVE_HIGH>; | 48 | gpios = <&gpx2 2 GPIO_ACTIVE_HIGH>; |
49 | linux,code = <KEY_HOME>; | 49 | linux,code = <KEY_HOME>; |
50 | label = "home key"; | 50 | label = "home key"; |
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index 82221a00444d..35e9b94b86b8 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts | |||
@@ -144,7 +144,7 @@ | |||
144 | max77693@66 { | 144 | max77693@66 { |
145 | compatible = "maxim,max77693"; | 145 | compatible = "maxim,max77693"; |
146 | interrupt-parent = <&gpx1>; | 146 | interrupt-parent = <&gpx1>; |
147 | interrupts = <5 2>; | 147 | interrupts = <5 IRQ_TYPE_EDGE_FALLING>; |
148 | reg = <0x66>; | 148 | reg = <0x66>; |
149 | 149 | ||
150 | regulators { | 150 | regulators { |
@@ -224,7 +224,7 @@ | |||
224 | compatible = "capella,cm36651"; | 224 | compatible = "capella,cm36651"; |
225 | reg = <0x18>; | 225 | reg = <0x18>; |
226 | interrupt-parent = <&gpx0>; | 226 | interrupt-parent = <&gpx0>; |
227 | interrupts = <2 2>; | 227 | interrupts = <2 IRQ_TYPE_EDGE_FALLING>; |
228 | vled-supply = <&ps_als_reg>; | 228 | vled-supply = <&ps_als_reg>; |
229 | }; | 229 | }; |
230 | }; | 230 | }; |
@@ -573,7 +573,7 @@ | |||
573 | compatible = "melfas,mms114"; | 573 | compatible = "melfas,mms114"; |
574 | reg = <0x48>; | 574 | reg = <0x48>; |
575 | interrupt-parent = <&gpm2>; | 575 | interrupt-parent = <&gpm2>; |
576 | interrupts = <3 2>; | 576 | interrupts = <3 IRQ_TYPE_EDGE_FALLING>; |
577 | x-size = <720>; | 577 | x-size = <720>; |
578 | y-size = <1280>; | 578 | y-size = <1280>; |
579 | avdd-supply = <&ldo23_reg>; | 579 | avdd-supply = <&ldo23_reg>; |
@@ -611,7 +611,7 @@ | |||
611 | max77686: max77686_pmic@09 { | 611 | max77686: max77686_pmic@09 { |
612 | compatible = "maxim,max77686"; | 612 | compatible = "maxim,max77686"; |
613 | interrupt-parent = <&gpx0>; | 613 | interrupt-parent = <&gpx0>; |
614 | interrupts = <7 0>; | 614 | interrupts = <7 IRQ_TYPE_NONE>; |
615 | reg = <0x09>; | 615 | reg = <0x09>; |
616 | #clock-cells = <1>; | 616 | #clock-cells = <1>; |
617 | 617 | ||
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 2cd65699a29c..f9a75bfd3f2b 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts | |||
@@ -603,7 +603,7 @@ | |||
603 | max98090: codec@10 { | 603 | max98090: codec@10 { |
604 | compatible = "maxim,max98090"; | 604 | compatible = "maxim,max98090"; |
605 | reg = <0x10>; | 605 | reg = <0x10>; |
606 | interrupts = <2 0>; | 606 | interrupts = <2 IRQ_TYPE_NONE>; |
607 | interrupt-parent = <&gpx0>; | 607 | interrupt-parent = <&gpx0>; |
608 | pinctrl-names = "default"; | 608 | pinctrl-names = "default"; |
609 | pinctrl-0 = <&max98090_irq>; | 609 | pinctrl-0 = <&max98090_irq>; |
@@ -944,7 +944,7 @@ | |||
944 | cros_ec: cros-ec@0 { | 944 | cros_ec: cros-ec@0 { |
945 | compatible = "google,cros-ec-spi"; | 945 | compatible = "google,cros-ec-spi"; |
946 | interrupt-parent = <&gpx1>; | 946 | interrupt-parent = <&gpx1>; |
947 | interrupts = <5 0>; | 947 | interrupts = <5 IRQ_TYPE_NONE>; |
948 | pinctrl-names = "default"; | 948 | pinctrl-names = "default"; |
949 | pinctrl-0 = <&ec_spi_cs &ec_irq>; | 949 | pinctrl-0 = <&ec_spi_cs &ec_irq>; |
950 | reg = <0>; | 950 | reg = <0>; |
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi index 9493923ec652..c0b85981c6bf 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | |||
@@ -49,7 +49,7 @@ | |||
49 | compatible = "maxim,max98090"; | 49 | compatible = "maxim,max98090"; |
50 | reg = <0x10>; | 50 | reg = <0x10>; |
51 | interrupt-parent = <&gpx3>; | 51 | interrupt-parent = <&gpx3>; |
52 | interrupts = <2 0>; | 52 | interrupts = <2 IRQ_TYPE_NONE>; |
53 | clocks = <&i2s0 CLK_I2S_CDCLK>; | 53 | clocks = <&i2s0 CLK_I2S_CDCLK>; |
54 | clock-names = "mclk"; | 54 | clock-names = "mclk"; |
55 | #sound-dai-cells = <0>; | 55 | #sound-dai-cells = <0>; |
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts index ecf1c916e8fc..953dc8677dc8 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts | |||
@@ -603,7 +603,7 @@ | |||
603 | max98091: codec@10 { | 603 | max98091: codec@10 { |
604 | compatible = "maxim,max98091"; | 604 | compatible = "maxim,max98091"; |
605 | reg = <0x10>; | 605 | reg = <0x10>; |
606 | interrupts = <2 0>; | 606 | interrupts = <2 IRQ_TYPE_NONE>; |
607 | interrupt-parent = <&gpx0>; | 607 | interrupt-parent = <&gpx0>; |
608 | pinctrl-names = "default"; | 608 | pinctrl-names = "default"; |
609 | pinctrl-0 = <&max98091_irq>; | 609 | pinctrl-0 = <&max98091_irq>; |
@@ -913,7 +913,7 @@ | |||
913 | cros_ec: cros-ec@0 { | 913 | cros_ec: cros-ec@0 { |
914 | compatible = "google,cros-ec-spi"; | 914 | compatible = "google,cros-ec-spi"; |
915 | interrupt-parent = <&gpx1>; | 915 | interrupt-parent = <&gpx1>; |
916 | interrupts = <5 0>; | 916 | interrupts = <5 IRQ_TYPE_NONE>; |
917 | pinctrl-names = "default"; | 917 | pinctrl-names = "default"; |
918 | pinctrl-0 = <&ec_spi_cs &ec_irq>; | 918 | pinctrl-0 = <&ec_spi_cs &ec_irq>; |
919 | reg = <0>; | 919 | reg = <0>; |