diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-12-16 16:59:54 -0500 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-01-21 03:58:55 -0500 |
commit | 7145570159fb20654b507026a8e388f739fffa5c (patch) | |
tree | 0453d71d55b8d5ca6e493359cd90ccd5aeb48589 /arch/arm | |
parent | 721c259a88486c4c686afbf51a19bad556cc385e (diff) |
ARM: sunxi: DT: Convert to device tree includes
Prepare the device trees to use the C preprocessor.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm')
35 files changed, 61 insertions, 60 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts index 3bcfd81837f0..3bb636978582 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts | |||
@@ -48,8 +48,8 @@ | |||
48 | */ | 48 | */ |
49 | 49 | ||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | /include/ "sun4i-a10.dtsi" | 51 | #include "sun4i-a10.dtsi" |
52 | /include/ "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | / { | 54 | / { |
55 | model = "Mele A1000"; | 55 | model = "Mele A1000"; |
diff --git a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts index f3f2974658e4..b2b45c4f7915 100644 --- a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts +++ b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | |||
@@ -46,8 +46,8 @@ | |||
46 | */ | 46 | */ |
47 | 47 | ||
48 | /dts-v1/; | 48 | /dts-v1/; |
49 | /include/ "sun4i-a10.dtsi" | 49 | #include "sun4i-a10.dtsi" |
50 | /include/ "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | / { | 52 | / { |
53 | model = "BA10 tvbox"; | 53 | model = "BA10 tvbox"; |
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index 140e3ee0c15f..b9202716fbdb 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts | |||
@@ -47,8 +47,8 @@ | |||
47 | */ | 47 | */ |
48 | 48 | ||
49 | /dts-v1/; | 49 | /dts-v1/; |
50 | /include/ "sun4i-a10.dtsi" | 50 | #include "sun4i-a10.dtsi" |
51 | /include/ "sunxi-common-regulators.dtsi" | 51 | #include "sunxi-common-regulators.dtsi" |
52 | 52 | ||
53 | / { | 53 | / { |
54 | model = "Cubietech Cubieboard"; | 54 | model = "Cubietech Cubieboard"; |
diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index efc116287e0f..0c6c81a6b61b 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts | |||
@@ -48,8 +48,8 @@ | |||
48 | */ | 48 | */ |
49 | 49 | ||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | /include/ "sun4i-a10.dtsi" | 51 | #include "sun4i-a10.dtsi" |
52 | /include/ "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | / { | 54 | / { |
55 | model = "Miniand Hackberry"; | 55 | model = "Miniand Hackberry"; |
diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts index 3e25ee4d3248..5980ad0e69e3 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | |||
@@ -48,8 +48,8 @@ | |||
48 | */ | 48 | */ |
49 | 49 | ||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | /include/ "sun4i-a10.dtsi" | 51 | #include "sun4i-a10.dtsi" |
52 | /include/ "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | / { | 54 | / { |
55 | model = "INet-97F Rev 02"; | 55 | model = "INet-97F Rev 02"; |
diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts index 8b3f97470249..e55639988e5d 100644 --- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts +++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | |||
@@ -48,8 +48,8 @@ | |||
48 | */ | 48 | */ |
49 | 49 | ||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | /include/ "sun4i-a10.dtsi" | 51 | #include "sun4i-a10.dtsi" |
52 | /include/ "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | / { | 54 | / { |
55 | model = "PineRiver Mini X-Plus"; | 55 | model = "PineRiver Mini X-Plus"; |
diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts index 88cf1a531155..3f607946abad 100644 --- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | |||
@@ -46,8 +46,8 @@ | |||
46 | */ | 46 | */ |
47 | 47 | ||
48 | /dts-v1/; | 48 | /dts-v1/; |
49 | /include/ "sun4i-a10.dtsi" | 49 | #include "sun4i-a10.dtsi" |
50 | /include/ "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | / { | 52 | / { |
53 | model = "Olimex A10-OLinuXino-LIME"; | 53 | model = "Olimex A10-OLinuXino-LIME"; |
diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts index ce5994597407..7367eff79dea 100644 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts | |||
@@ -47,8 +47,8 @@ | |||
47 | */ | 47 | */ |
48 | 48 | ||
49 | /dts-v1/; | 49 | /dts-v1/; |
50 | /include/ "sun4i-a10.dtsi" | 50 | #include "sun4i-a10.dtsi" |
51 | /include/ "sunxi-common-regulators.dtsi" | 51 | #include "sunxi-common-regulators.dtsi" |
52 | 52 | ||
53 | / { | 53 | / { |
54 | model = "LinkSprite pcDuino"; | 54 | model = "LinkSprite pcDuino"; |
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 0e3cc9aed484..94283a5fa77c 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi | |||
@@ -10,7 +10,7 @@ | |||
10 | * http://www.gnu.org/copyleft/gpl.html | 10 | * http://www.gnu.org/copyleft/gpl.html |
11 | */ | 11 | */ |
12 | 12 | ||
13 | /include/ "skeleton.dtsi" | 13 | #include "skeleton.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | interrupt-parent = <&intc>; | 16 | interrupt-parent = <&intc>; |
diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts index 1fa2916eafc2..3a0d9dc39914 100644 --- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts +++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | |||
@@ -46,8 +46,8 @@ | |||
46 | */ | 46 | */ |
47 | 47 | ||
48 | /dts-v1/; | 48 | /dts-v1/; |
49 | /include/ "sun5i-a10s.dtsi" | 49 | #include "sun5i-a10s.dtsi" |
50 | /include/ "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | / { | 52 | / { |
53 | model = "R7 A10s hdmi tv-stick"; | 53 | model = "R7 A10s hdmi tv-stick"; |
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index b36a65c50bc1..452b774332cc 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi | |||
@@ -11,7 +11,7 @@ | |||
11 | * http://www.gnu.org/copyleft/gpl.html | 11 | * http://www.gnu.org/copyleft/gpl.html |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /include/ "skeleton.dtsi" | 14 | #include "skeleton.dtsi" |
15 | 15 | ||
16 | / { | 16 | / { |
17 | interrupt-parent = <&intc>; | 17 | interrupt-parent = <&intc>; |
diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts index eeed1f236ee8..ca6b6dd30e47 100644 --- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts +++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | |||
@@ -46,8 +46,8 @@ | |||
46 | */ | 46 | */ |
47 | 47 | ||
48 | /dts-v1/; | 48 | /dts-v1/; |
49 | /include/ "sun5i-a13.dtsi" | 49 | #include "sun5i-a13.dtsi" |
50 | /include/ "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | / { | 52 | / { |
53 | model = "HSG H702"; | 53 | model = "HSG H702"; |
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts index 916ee8bb826f..729f02daf605 100644 --- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | |||
@@ -47,8 +47,8 @@ | |||
47 | */ | 47 | */ |
48 | 48 | ||
49 | /dts-v1/; | 49 | /dts-v1/; |
50 | /include/ "sun5i-a13.dtsi" | 50 | #include "sun5i-a13.dtsi" |
51 | /include/ "sunxi-common-regulators.dtsi" | 51 | #include "sunxi-common-regulators.dtsi" |
52 | 52 | ||
53 | / { | 53 | / { |
54 | model = "Olimex A13-Olinuxino Micro"; | 54 | model = "Olimex A13-Olinuxino Micro"; |
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index 17d3e795856b..93f1c8435019 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi | |||
@@ -11,7 +11,7 @@ | |||
11 | * http://www.gnu.org/copyleft/gpl.html | 11 | * http://www.gnu.org/copyleft/gpl.html |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /include/ "skeleton.dtsi" | 14 | #include "skeleton.dtsi" |
15 | 15 | ||
16 | / { | 16 | / { |
17 | interrupt-parent = <&intc>; | 17 | interrupt-parent = <&intc>; |
diff --git a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts index c74a63a39531..42a11f4795f7 100644 --- a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts +++ b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | |||
@@ -48,8 +48,8 @@ | |||
48 | */ | 48 | */ |
49 | 49 | ||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | /include/ "sun6i-a31.dtsi" | 51 | #include "sun6i-a31.dtsi" |
52 | /include/ "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | / { | 54 | / { |
55 | model = "Allwinner A31 APP4 EVB1 Evaluation Board"; | 55 | model = "Allwinner A31 APP4 EVB1 Evaluation Board"; |
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts index c36b4dc89c13..2e5bcaf6e860 100644 --- a/arch/arm/boot/dts/sun6i-a31-colombus.dts +++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts | |||
@@ -48,8 +48,8 @@ | |||
48 | */ | 48 | */ |
49 | 49 | ||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | /include/ "sun6i-a31.dtsi" | 51 | #include "sun6i-a31.dtsi" |
52 | /include/ "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | / { | 54 | / { |
55 | model = "WITS A31 Colombus Evaluation Board"; | 55 | model = "WITS A31 Colombus Evaluation Board"; |
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts index 55a367ac2a0a..a3bf20930d50 100644 --- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts +++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts | |||
@@ -48,8 +48,8 @@ | |||
48 | */ | 48 | */ |
49 | 49 | ||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | /include/ "sun6i-a31.dtsi" | 51 | #include "sun6i-a31.dtsi" |
52 | /include/ "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | / { | 54 | / { |
55 | model = "Merrii A31 Hummingbird"; | 55 | model = "Merrii A31 Hummingbird"; |
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts index fccf709195e0..74d4a23a0bdc 100644 --- a/arch/arm/boot/dts/sun6i-a31-m9.dts +++ b/arch/arm/boot/dts/sun6i-a31-m9.dts | |||
@@ -46,8 +46,8 @@ | |||
46 | */ | 46 | */ |
47 | 47 | ||
48 | /dts-v1/; | 48 | /dts-v1/; |
49 | /include/ "sun6i-a31.dtsi" | 49 | #include "sun6i-a31.dtsi" |
50 | /include/ "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | / { | 52 | / { |
53 | model = "Mele M9 / A1000G Quad top set box"; | 53 | model = "Mele M9 / A1000G Quad top set box"; |
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index c50d4e8c1150..b47d42ab1c1f 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi | |||
@@ -47,7 +47,7 @@ | |||
47 | * OTHER DEALINGS IN THE SOFTWARE. | 47 | * OTHER DEALINGS IN THE SOFTWARE. |
48 | */ | 48 | */ |
49 | 49 | ||
50 | /include/ "skeleton.dtsi" | 50 | #include "skeleton.dtsi" |
51 | 51 | ||
52 | / { | 52 | / { |
53 | interrupt-parent = <&gic>; | 53 | interrupt-parent = <&gic>; |
diff --git a/arch/arm/boot/dts/sun6i-a31s-cs908.dts b/arch/arm/boot/dts/sun6i-a31s-cs908.dts index 491aa83cad5d..dc57ffa3e82c 100644 --- a/arch/arm/boot/dts/sun6i-a31s-cs908.dts +++ b/arch/arm/boot/dts/sun6i-a31s-cs908.dts | |||
@@ -46,7 +46,7 @@ | |||
46 | */ | 46 | */ |
47 | 47 | ||
48 | /dts-v1/; | 48 | /dts-v1/; |
49 | /include/ "sun6i-a31s.dtsi" | 49 | #include "sun6i-a31s.dtsi" |
50 | 50 | ||
51 | / { | 51 | / { |
52 | model = "CSQ CS908 top set box"; | 52 | model = "CSQ CS908 top set box"; |
diff --git a/arch/arm/boot/dts/sun6i-a31s.dtsi b/arch/arm/boot/dts/sun6i-a31s.dtsi index 1e73e19db9d7..eaf5ec8fd459 100644 --- a/arch/arm/boot/dts/sun6i-a31s.dtsi +++ b/arch/arm/boot/dts/sun6i-a31s.dtsi | |||
@@ -51,7 +51,7 @@ | |||
51 | * identical. | 51 | * identical. |
52 | */ | 52 | */ |
53 | 53 | ||
54 | /include/ "sun6i-a31.dtsi" | 54 | #include "sun6i-a31.dtsi" |
55 | 55 | ||
56 | &pio { | 56 | &pio { |
57 | compatible = "allwinner,sun6i-a31s-pinctrl"; | 57 | compatible = "allwinner,sun6i-a31s-pinctrl"; |
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts index 1cf1214cc068..e9e96584bedd 100644 --- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts +++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts | |||
@@ -48,8 +48,8 @@ | |||
48 | */ | 48 | */ |
49 | 49 | ||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | /include/ "sun7i-a20.dtsi" | 51 | #include "sun7i-a20.dtsi" |
52 | /include/ "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | / { | 54 | / { |
55 | model = "LeMaker Banana Pi"; | 55 | model = "LeMaker Banana Pi"; |
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts index 53680983461a..809d448ecf30 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | |||
@@ -12,8 +12,8 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | /dts-v1/; | 14 | /dts-v1/; |
15 | /include/ "sun7i-a20.dtsi" | 15 | #include "sun7i-a20.dtsi" |
16 | /include/ "sunxi-common-regulators.dtsi" | 16 | #include "sunxi-common-regulators.dtsi" |
17 | 17 | ||
18 | / { | 18 | / { |
19 | model = "Cubietech Cubieboard2"; | 19 | model = "Cubietech Cubieboard2"; |
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts index a281d259b9b8..9812a3a34831 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts | |||
@@ -12,8 +12,8 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | /dts-v1/; | 14 | /dts-v1/; |
15 | /include/ "sun7i-a20.dtsi" | 15 | #include "sun7i-a20.dtsi" |
16 | /include/ "sunxi-common-regulators.dtsi" | 16 | #include "sunxi-common-regulators.dtsi" |
17 | 17 | ||
18 | / { | 18 | / { |
19 | model = "Cubietech Cubietruck"; | 19 | model = "Cubietech Cubietruck"; |
diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts index 0e4bfa3b2b85..add6d95a0246 100644 --- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts +++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts | |||
@@ -12,8 +12,8 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | /dts-v1/; | 14 | /dts-v1/; |
15 | /include/ "sun7i-a20.dtsi" | 15 | #include "sun7i-a20.dtsi" |
16 | /include/ "sunxi-common-regulators.dtsi" | 16 | #include "sunxi-common-regulators.dtsi" |
17 | 17 | ||
18 | / { | 18 | / { |
19 | model = "Merrii A20 Hummingbird"; | 19 | model = "Merrii A20 Hummingbird"; |
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts index f38bb1a6656c..780f1aa98429 100644 --- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts +++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | |||
@@ -46,8 +46,8 @@ | |||
46 | */ | 46 | */ |
47 | 47 | ||
48 | /dts-v1/; | 48 | /dts-v1/; |
49 | /include/ "sun7i-a20.dtsi" | 49 | #include "sun7i-a20.dtsi" |
50 | /include/ "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | / { | 52 | / { |
53 | model = "I12 / Q5 / QT840A A20 tvbox"; | 53 | model = "I12 / Q5 / QT840A A20 tvbox"; |
diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts index b8e568c55271..82046234d9e8 100644 --- a/arch/arm/boot/dts/sun7i-a20-m3.dts +++ b/arch/arm/boot/dts/sun7i-a20-m3.dts | |||
@@ -48,8 +48,8 @@ | |||
48 | */ | 48 | */ |
49 | 49 | ||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | /include/ "sun7i-a20.dtsi" | 51 | #include "sun7i-a20.dtsi" |
52 | /include/ "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | / { | 54 | / { |
55 | model = "Mele M3"; | 55 | model = "Mele M3"; |
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts index 3f3ff9693992..996da8be0e44 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | |||
@@ -49,8 +49,8 @@ | |||
49 | */ | 49 | */ |
50 | 50 | ||
51 | /dts-v1/; | 51 | /dts-v1/; |
52 | /include/ "sun7i-a20.dtsi" | 52 | #include "sun7i-a20.dtsi" |
53 | /include/ "sunxi-common-regulators.dtsi" | 53 | #include "sunxi-common-regulators.dtsi" |
54 | 54 | ||
55 | / { | 55 | / { |
56 | model = "Olimex A20-OLinuXino-LIME"; | 56 | model = "Olimex A20-OLinuXino-LIME"; |
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts index ed364d5e755e..5fda1e02acdb 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | |||
@@ -46,8 +46,8 @@ | |||
46 | */ | 46 | */ |
47 | 47 | ||
48 | /dts-v1/; | 48 | /dts-v1/; |
49 | /include/ "sun7i-a20.dtsi" | 49 | #include "sun7i-a20.dtsi" |
50 | /include/ "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | / { | 52 | / { |
53 | model = "Olimex A20-OLinuXino-LIME2"; | 53 | model = "Olimex A20-OLinuXino-LIME2"; |
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts index 8dca49b2477b..eb7b8878303d 100644 --- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts +++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts | |||
@@ -47,8 +47,9 @@ | |||
47 | */ | 47 | */ |
48 | 48 | ||
49 | /dts-v1/; | 49 | /dts-v1/; |
50 | /include/ "sun7i-a20.dtsi" | 50 | #include "sun7i-a20.dtsi" |
51 | /include/ "sunxi-common-regulators.dtsi" | 51 | #include "sunxi-common-regulators.dtsi" |
52 | |||
52 | #include <dt-bindings/gpio/gpio.h> | 53 | #include <dt-bindings/gpio/gpio.h> |
53 | #include <dt-bindings/input/input.h> | 54 | #include <dt-bindings/input/input.h> |
54 | 55 | ||
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 9f67508cd611..8c0507054757 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi | |||
@@ -47,7 +47,7 @@ | |||
47 | * OTHER DEALINGS IN THE SOFTWARE. | 47 | * OTHER DEALINGS IN THE SOFTWARE. |
48 | */ | 48 | */ |
49 | 49 | ||
50 | /include/ "skeleton.dtsi" | 50 | #include "skeleton.dtsi" |
51 | 51 | ||
52 | / { | 52 | / { |
53 | interrupt-parent = <&gic>; | 53 | interrupt-parent = <&gic>; |
diff --git a/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts b/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts index 32ad80804dbb..adc3a54b6612 100644 --- a/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts +++ b/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | |||
@@ -48,8 +48,8 @@ | |||
48 | */ | 48 | */ |
49 | 49 | ||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | /include/ "sun8i-a23.dtsi" | 51 | #include "sun8i-a23.dtsi" |
52 | /include/ "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | / { | 54 | / { |
55 | model = "Ippo Q8H Dual Core Tablet (v5)"; | 55 | model = "Ippo Q8H Dual Core Tablet (v5)"; |
diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi index 0746cd1024d7..4b0ae502f59e 100644 --- a/arch/arm/boot/dts/sun8i-a23.dtsi +++ b/arch/arm/boot/dts/sun8i-a23.dtsi | |||
@@ -47,7 +47,7 @@ | |||
47 | * OTHER DEALINGS IN THE SOFTWARE. | 47 | * OTHER DEALINGS IN THE SOFTWARE. |
48 | */ | 48 | */ |
49 | 49 | ||
50 | /include/ "skeleton.dtsi" | 50 | #include "skeleton.dtsi" |
51 | 51 | ||
52 | / { | 52 | / { |
53 | interrupt-parent = <&gic>; | 53 | interrupt-parent = <&gic>; |
diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index 506948f582ee..7fe242a8134b 100644 --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts | |||
@@ -48,7 +48,7 @@ | |||
48 | */ | 48 | */ |
49 | 49 | ||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | /include/ "sun9i-a80.dtsi" | 51 | #include "sun9i-a80.dtsi" |
52 | 52 | ||
53 | / { | 53 | / { |
54 | model = "Merrii A80 Optimus Board"; | 54 | model = "Merrii A80 Optimus Board"; |
diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi index 494714f67b57..90d0450850e9 100644 --- a/arch/arm/boot/dts/sun9i-a80.dtsi +++ b/arch/arm/boot/dts/sun9i-a80.dtsi | |||
@@ -47,7 +47,7 @@ | |||
47 | * OTHER DEALINGS IN THE SOFTWARE. | 47 | * OTHER DEALINGS IN THE SOFTWARE. |
48 | */ | 48 | */ |
49 | 49 | ||
50 | /include/ "skeleton64.dtsi" | 50 | #include "skeleton64.dtsi" |
51 | 51 | ||
52 | / { | 52 | / { |
53 | interrupt-parent = <&gic>; | 53 | interrupt-parent = <&gic>; |