diff options
Diffstat (limited to 'arch/arm/boot')
25 files changed, 55 insertions, 34 deletions
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index a082f0ba1ddb..a1529455f081 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi | |||
@@ -360,6 +360,11 @@ | |||
360 | interrupt-controller; | 360 | interrupt-controller; |
361 | #interrupt-cells = <2>; | 361 | #interrupt-cells = <2>; |
362 | 362 | ||
363 | ab8500_gpio: ab8500-gpio { | ||
364 | gpio-controller; | ||
365 | #gpio-cells = <2>; | ||
366 | }; | ||
367 | |||
363 | ab8500-rtc { | 368 | ab8500-rtc { |
364 | compatible = "stericsson,ab8500-rtc"; | 369 | compatible = "stericsson,ab8500-rtc"; |
365 | interrupts = <17 IRQ_TYPE_LEVEL_HIGH | 370 | interrupts = <17 IRQ_TYPE_LEVEL_HIGH |
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index bed40ee2e4f6..3f94fe8e3706 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi | |||
@@ -19,7 +19,7 @@ | |||
19 | * published by the Free Software Foundation. | 19 | * published by the Free Software Foundation. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | /include/ "skeleton.dtsi" | 22 | #include "skeleton.dtsi" |
23 | 23 | ||
24 | / { | 24 | / { |
25 | interrupt-parent = <&gic>; | 25 | interrupt-parent = <&gic>; |
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index 08609b8bdaf1..382d8c7e2906 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts | |||
@@ -15,7 +15,7 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | /dts-v1/; | 17 | /dts-v1/; |
18 | /include/ "exynos4210.dtsi" | 18 | #include "exynos4210.dtsi" |
19 | 19 | ||
20 | / { | 20 | / { |
21 | model = "Insignal Origen evaluation board based on Exynos4210"; | 21 | model = "Insignal Origen evaluation board based on Exynos4210"; |
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts index 91332b72acf5..9c01b718d29d 100644 --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts | |||
@@ -15,7 +15,7 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | /dts-v1/; | 17 | /dts-v1/; |
18 | /include/ "exynos4210.dtsi" | 18 | #include "exynos4210.dtsi" |
19 | 19 | ||
20 | / { | 20 | / { |
21 | model = "Samsung smdkv310 evaluation board based on Exynos4210"; | 21 | model = "Samsung smdkv310 evaluation board based on Exynos4210"; |
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts index 9a14484c7bb1..94eebffe3044 100644 --- a/arch/arm/boot/dts/exynos4210-trats.dts +++ b/arch/arm/boot/dts/exynos4210-trats.dts | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | /dts-v1/; | 15 | /dts-v1/; |
16 | /include/ "exynos4210.dtsi" | 16 | #include "exynos4210.dtsi" |
17 | 17 | ||
18 | / { | 18 | / { |
19 | model = "Samsung Trats based on Exynos4210"; | 19 | model = "Samsung Trats based on Exynos4210"; |
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts index 345cdb51dcb7..889cdada1ce9 100644 --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | /dts-v1/; | 15 | /dts-v1/; |
16 | /include/ "exynos4210.dtsi" | 16 | #include "exynos4210.dtsi" |
17 | 17 | ||
18 | / { | 18 | / { |
19 | model = "Samsung Universal C210 based on Exynos4210 rev0"; | 19 | model = "Samsung Universal C210 based on Exynos4210 rev0"; |
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index d4f8067e89ba..b7f358a93bcb 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi | |||
@@ -19,8 +19,8 @@ | |||
19 | * published by the Free Software Foundation. | 19 | * published by the Free Software Foundation. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | /include/ "exynos4.dtsi" | 22 | #include "exynos4.dtsi" |
23 | /include/ "exynos4210-pinctrl.dtsi" | 23 | #include "exynos4210-pinctrl.dtsi" |
24 | 24 | ||
25 | / { | 25 | / { |
26 | compatible = "samsung,exynos4210"; | 26 | compatible = "samsung,exynos4210"; |
diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi index c0f60f49cea6..6f34d7f6ba7e 100644 --- a/arch/arm/boot/dts/exynos4212.dtsi +++ b/arch/arm/boot/dts/exynos4212.dtsi | |||
@@ -17,7 +17,7 @@ | |||
17 | * published by the Free Software Foundation. | 17 | * published by the Free Software Foundation. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | /include/ "exynos4x12.dtsi" | 20 | #include "exynos4x12.dtsi" |
21 | 21 | ||
22 | / { | 22 | / { |
23 | compatible = "samsung,exynos4212"; | 23 | compatible = "samsung,exynos4212"; |
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts index 867d9452619b..46c678ee119c 100644 --- a/arch/arm/boot/dts/exynos4412-odroidx.dts +++ b/arch/arm/boot/dts/exynos4412-odroidx.dts | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | /dts-v1/; | 14 | /dts-v1/; |
15 | /include/ "exynos4412.dtsi" | 15 | #include "exynos4412.dtsi" |
16 | 16 | ||
17 | / { | 17 | / { |
18 | model = "Hardkernel ODROID-X board based on Exynos4412"; | 18 | model = "Hardkernel ODROID-X board based on Exynos4412"; |
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts index ca73c42f77e1..7993641cb32a 100644 --- a/arch/arm/boot/dts/exynos4412-origen.dts +++ b/arch/arm/boot/dts/exynos4412-origen.dts | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | /dts-v1/; | 15 | /dts-v1/; |
16 | /include/ "exynos4412.dtsi" | 16 | #include "exynos4412.dtsi" |
17 | 17 | ||
18 | / { | 18 | / { |
19 | model = "Insignal Origen evaluation board based on Exynos4412"; | 19 | model = "Insignal Origen evaluation board based on Exynos4412"; |
diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts index a8ba195c41ac..ad316a1ee9e0 100644 --- a/arch/arm/boot/dts/exynos4412-smdk4412.dts +++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | /dts-v1/; | 15 | /dts-v1/; |
16 | /include/ "exynos4412.dtsi" | 16 | #include "exynos4412.dtsi" |
17 | 17 | ||
18 | / { | 18 | / { |
19 | model = "Samsung SMDK evaluation board based on Exynos4412"; | 19 | model = "Samsung SMDK evaluation board based on Exynos4412"; |
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index 270b389e0a1b..e743e677a9e2 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi | |||
@@ -17,7 +17,7 @@ | |||
17 | * published by the Free Software Foundation. | 17 | * published by the Free Software Foundation. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | /include/ "exynos4x12.dtsi" | 20 | #include "exynos4x12.dtsi" |
21 | 21 | ||
22 | / { | 22 | / { |
23 | compatible = "samsung,exynos4412"; | 23 | compatible = "samsung,exynos4412"; |
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi index 35cb2099d55e..01da194ba329 100644 --- a/arch/arm/boot/dts/exynos4x12.dtsi +++ b/arch/arm/boot/dts/exynos4x12.dtsi | |||
@@ -17,8 +17,8 @@ | |||
17 | * published by the Free Software Foundation. | 17 | * published by the Free Software Foundation. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | /include/ "exynos4.dtsi" | 20 | #include "exynos4.dtsi" |
21 | /include/ "exynos4x12-pinctrl.dtsi" | 21 | #include "exynos4x12-pinctrl.dtsi" |
22 | 22 | ||
23 | / { | 23 | / { |
24 | aliases { | 24 | aliases { |
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index c6db281a3430..abc7272c7afd 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | /include/ "exynos5250.dtsi" | 13 | #include "exynos5250.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | model = "Insignal Arndale evaluation board based on EXYNOS5250"; | 16 | model = "Insignal Arndale evaluation board based on EXYNOS5250"; |
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 1e21200b6d85..35a66dee4011 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | /include/ "exynos5250.dtsi" | 13 | #include "exynos5250.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | model = "SAMSUNG SMDK5250 board based on EXYNOS5250"; | 16 | model = "SAMSUNG SMDK5250 board based on EXYNOS5250"; |
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index 05244f150dd9..e79331dba12d 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts | |||
@@ -9,8 +9,8 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | /dts-v1/; | 11 | /dts-v1/; |
12 | /include/ "exynos5250.dtsi" | 12 | #include "exynos5250.dtsi" |
13 | /include/ "cros5250-common.dtsi" | 13 | #include "cros5250-common.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | model = "Google Snow"; | 16 | model = "Google Snow"; |
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 54a35e64c781..964158c1844f 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
@@ -17,8 +17,10 @@ | |||
17 | * published by the Free Software Foundation. | 17 | * published by the Free Software Foundation. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | /include/ "skeleton.dtsi" | 20 | #include "skeleton.dtsi" |
21 | /include/ "exynos5250-pinctrl.dtsi" | 21 | #include "exynos5250-pinctrl.dtsi" |
22 | |||
23 | #include <dt-bindings/clk/exynos-audss-clk.h> | ||
22 | 24 | ||
23 | / { | 25 | / { |
24 | compatible = "samsung,exynos5250"; | 26 | compatible = "samsung,exynos5250"; |
@@ -72,6 +74,12 @@ | |||
72 | #clock-cells = <1>; | 74 | #clock-cells = <1>; |
73 | }; | 75 | }; |
74 | 76 | ||
77 | clock_audss: audss-clock-controller@3810000 { | ||
78 | compatible = "samsung,exynos5250-audss-clock"; | ||
79 | reg = <0x03810000 0x0C>; | ||
80 | #clock-cells = <1>; | ||
81 | }; | ||
82 | |||
75 | gic:interrupt-controller@10481000 { | 83 | gic:interrupt-controller@10481000 { |
76 | compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic"; | 84 | compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic"; |
77 | #interrupt-cells = <3>; | 85 | #interrupt-cells = <3>; |
@@ -451,6 +459,10 @@ | |||
451 | &pdma0 9 | 459 | &pdma0 9 |
452 | &pdma0 8>; | 460 | &pdma0 8>; |
453 | dma-names = "tx", "rx", "tx-sec"; | 461 | dma-names = "tx", "rx", "tx-sec"; |
462 | clocks = <&clock_audss EXYNOS_I2S_BUS>, | ||
463 | <&clock_audss EXYNOS_I2S_BUS>, | ||
464 | <&clock_audss EXYNOS_SCLK_I2S>; | ||
465 | clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; | ||
454 | samsung,supports-6ch; | 466 | samsung,supports-6ch; |
455 | samsung,supports-rstclr; | 467 | samsung,supports-rstclr; |
456 | samsung,supports-secdai; | 468 | samsung,supports-secdai; |
@@ -465,6 +477,8 @@ | |||
465 | dmas = <&pdma1 12 | 477 | dmas = <&pdma1 12 |
466 | &pdma1 11>; | 478 | &pdma1 11>; |
467 | dma-names = "tx", "rx"; | 479 | dma-names = "tx", "rx"; |
480 | clocks = <&clock 307>, <&clock 157>; | ||
481 | clock-names = "iis", "i2s_opclk0"; | ||
468 | pinctrl-names = "default"; | 482 | pinctrl-names = "default"; |
469 | pinctrl-0 = <&i2s1_bus>; | 483 | pinctrl-0 = <&i2s1_bus>; |
470 | }; | 484 | }; |
@@ -475,6 +489,8 @@ | |||
475 | dmas = <&pdma0 12 | 489 | dmas = <&pdma0 12 |
476 | &pdma0 11>; | 490 | &pdma0 11>; |
477 | dma-names = "tx", "rx"; | 491 | dma-names = "tx", "rx"; |
492 | clocks = <&clock 308>, <&clock 158>; | ||
493 | clock-names = "iis", "i2s_opclk0"; | ||
478 | pinctrl-names = "default"; | 494 | pinctrl-names = "default"; |
479 | pinctrl-0 = <&i2s2_bus>; | 495 | pinctrl-0 = <&i2s2_bus>; |
480 | }; | 496 | }; |
diff --git a/arch/arm/boot/dts/exynos5440-sd5v1.dts b/arch/arm/boot/dts/exynos5440-sd5v1.dts index f722a0263ac8..5b22508050da 100644 --- a/arch/arm/boot/dts/exynos5440-sd5v1.dts +++ b/arch/arm/boot/dts/exynos5440-sd5v1.dts | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | /include/ "exynos5440.dtsi" | 13 | #include "exynos5440.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | model = "SAMSUNG SD5v1 board based on EXYNOS5440"; | 16 | model = "SAMSUNG SD5v1 board based on EXYNOS5440"; |
diff --git a/arch/arm/boot/dts/exynos5440-ssdk5440.dts b/arch/arm/boot/dts/exynos5440-ssdk5440.dts index ba88cfd2486f..ede772741f81 100644 --- a/arch/arm/boot/dts/exynos5440-ssdk5440.dts +++ b/arch/arm/boot/dts/exynos5440-ssdk5440.dts | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | /include/ "exynos5440.dtsi" | 13 | #include "exynos5440.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | model = "SAMSUNG SSDK5440 board based on EXYNOS5440"; | 16 | model = "SAMSUNG SSDK5440 board based on EXYNOS5440"; |
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi index bfcb907b7e33..ff7f5d855845 100644 --- a/arch/arm/boot/dts/exynos5440.dtsi +++ b/arch/arm/boot/dts/exynos5440.dtsi | |||
@@ -9,7 +9,7 @@ | |||
9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | /include/ "skeleton.dtsi" | 12 | #include "skeleton.dtsi" |
13 | 13 | ||
14 | / { | 14 | / { |
15 | compatible = "samsung,exynos5440"; | 15 | compatible = "samsung,exynos5440"; |
diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts index c4a1c0a97728..e2249bcc3e63 100644 --- a/arch/arm/boot/dts/omap3430-sdp.dts +++ b/arch/arm/boot/dts/omap3430-sdp.dts | |||
@@ -106,7 +106,6 @@ | |||
106 | nand-bus-width = <8>; | 106 | nand-bus-width = <8>; |
107 | 107 | ||
108 | ti,nand-ecc-opt = "sw"; | 108 | ti,nand-ecc-opt = "sw"; |
109 | gpmc,device-nand; | ||
110 | gpmc,cs-on-ns = <0>; | 109 | gpmc,cs-on-ns = <0>; |
111 | gpmc,cs-rd-off-ns = <36>; | 110 | gpmc,cs-rd-off-ns = <36>; |
112 | gpmc,cs-wr-off-ns = <36>; | 111 | gpmc,cs-wr-off-ns = <36>; |
diff --git a/arch/arm/boot/dts/s3c2416-smdk2416.dts b/arch/arm/boot/dts/s3c2416-smdk2416.dts index ad1dd09c10eb..59594cf15998 100644 --- a/arch/arm/boot/dts/s3c2416-smdk2416.dts +++ b/arch/arm/boot/dts/s3c2416-smdk2416.dts | |||
@@ -9,7 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | /dts-v1/; | 11 | /dts-v1/; |
12 | /include/ "s3c2416.dtsi" | 12 | #include "s3c2416.dtsi" |
13 | 13 | ||
14 | / { | 14 | / { |
15 | model = "SMDK2416"; | 15 | model = "SMDK2416"; |
diff --git a/arch/arm/boot/dts/s3c2416.dtsi b/arch/arm/boot/dts/s3c2416.dtsi index 6809324934a3..e6555bdd81b8 100644 --- a/arch/arm/boot/dts/s3c2416.dtsi +++ b/arch/arm/boot/dts/s3c2416.dtsi | |||
@@ -8,8 +8,8 @@ | |||
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /include/ "s3c24xx.dtsi" | 11 | #include "s3c24xx.dtsi" |
12 | /include/ "s3c2416-pinctrl.dtsi" | 12 | #include "s3c2416-pinctrl.dtsi" |
13 | 13 | ||
14 | / { | 14 | / { |
15 | model = "Samsung S3C2416 SoC"; | 15 | model = "Samsung S3C2416 SoC"; |
diff --git a/arch/arm/boot/dts/s3c24xx.dtsi b/arch/arm/boot/dts/s3c24xx.dtsi index cab46ff5fb4d..2d1d7dc9418a 100644 --- a/arch/arm/boot/dts/s3c24xx.dtsi +++ b/arch/arm/boot/dts/s3c24xx.dtsi | |||
@@ -8,7 +8,7 @@ | |||
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /include/ "skeleton.dtsi" | 11 | #include "skeleton.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | compatible = "samsung,s3c24xx"; | 14 | compatible = "samsung,s3c24xx"; |
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index fb9dce529da6..49824be66845 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts | |||
@@ -22,12 +22,13 @@ | |||
22 | 22 | ||
23 | en_3v3_reg: en_3v3 { | 23 | en_3v3_reg: en_3v3 { |
24 | compatible = "regulator-fixed"; | 24 | compatible = "regulator-fixed"; |
25 | regulator-name = "en-3v3-fixed-supply"; | 25 | regulator-name = "en-3v3-fixed-supply"; |
26 | regulator-min-microvolt = <3300000>; | 26 | regulator-min-microvolt = <3300000>; |
27 | regulator-max-microvolt = <3300000>; | 27 | regulator-max-microvolt = <3300000>; |
28 | gpios = <&gpio0 26 0x4>; // 26 | 28 | /* AB8500 GPIOs start from 1 - offset 25 is GPIO26. */ |
29 | startup-delay-us = <5000>; | 29 | gpio = <&ab8500_gpio 25 0x4>; |
30 | enable-active-high; | 30 | startup-delay-us = <5000>; |
31 | enable-active-high; | ||
31 | }; | 32 | }; |
32 | 33 | ||
33 | gpio_keys { | 34 | gpio_keys { |