Browse Source

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>
Maxime Ripard 10 years ago
parent
commit
7145570159
35 changed files with 61 additions and 60 deletions
  1. 2 2
      arch/arm/boot/dts/sun4i-a10-a1000.dts
  2. 2 2
      arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
  3. 2 2
      arch/arm/boot/dts/sun4i-a10-cubieboard.dts
  4. 2 2
      arch/arm/boot/dts/sun4i-a10-hackberry.dts
  5. 2 2
      arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
  6. 2 2
      arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
  7. 2 2
      arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
  8. 2 2
      arch/arm/boot/dts/sun4i-a10-pcduino.dts
  9. 1 1
      arch/arm/boot/dts/sun4i-a10.dtsi
  10. 2 2
      arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
  11. 1 1
      arch/arm/boot/dts/sun5i-a10s.dtsi
  12. 2 2
      arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
  13. 2 2
      arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
  14. 1 1
      arch/arm/boot/dts/sun5i-a13.dtsi
  15. 2 2
      arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
  16. 2 2
      arch/arm/boot/dts/sun6i-a31-colombus.dts
  17. 2 2
      arch/arm/boot/dts/sun6i-a31-hummingbird.dts
  18. 2 2
      arch/arm/boot/dts/sun6i-a31-m9.dts
  19. 1 1
      arch/arm/boot/dts/sun6i-a31.dtsi
  20. 1 1
      arch/arm/boot/dts/sun6i-a31s-cs908.dts
  21. 1 1
      arch/arm/boot/dts/sun6i-a31s.dtsi
  22. 2 2
      arch/arm/boot/dts/sun7i-a20-bananapi.dts
  23. 2 2
      arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
  24. 2 2
      arch/arm/boot/dts/sun7i-a20-cubietruck.dts
  25. 2 2
      arch/arm/boot/dts/sun7i-a20-hummingbird.dts
  26. 2 2
      arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
  27. 2 2
      arch/arm/boot/dts/sun7i-a20-m3.dts
  28. 2 2
      arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
  29. 2 2
      arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
  30. 3 2
      arch/arm/boot/dts/sun7i-a20-pcduino3.dts
  31. 1 1
      arch/arm/boot/dts/sun7i-a20.dtsi
  32. 2 2
      arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
  33. 1 1
      arch/arm/boot/dts/sun8i-a23.dtsi
  34. 1 1
      arch/arm/boot/dts/sun9i-a80-optimus.dts
  35. 1 1
      arch/arm/boot/dts/sun9i-a80.dtsi

+ 2 - 2
arch/arm/boot/dts/sun4i-a10-a1000.dts

@@ -48,8 +48,8 @@
  */
 
 /dts-v1/;
-/include/ "sun4i-a10.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun4i-a10.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Mele A1000";

+ 2 - 2
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts

@@ -46,8 +46,8 @@
  */
 
 /dts-v1/;
-/include/ "sun4i-a10.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun4i-a10.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "BA10 tvbox";

+ 2 - 2
arch/arm/boot/dts/sun4i-a10-cubieboard.dts

@@ -47,8 +47,8 @@
  */
 
 /dts-v1/;
-/include/ "sun4i-a10.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun4i-a10.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Cubietech Cubieboard";

+ 2 - 2
arch/arm/boot/dts/sun4i-a10-hackberry.dts

@@ -48,8 +48,8 @@
  */
 
 /dts-v1/;
-/include/ "sun4i-a10.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun4i-a10.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Miniand Hackberry";

+ 2 - 2
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts

@@ -48,8 +48,8 @@
  */
 
 /dts-v1/;
-/include/ "sun4i-a10.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun4i-a10.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "INet-97F Rev 02";

+ 2 - 2
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts

@@ -48,8 +48,8 @@
  */
 
 /dts-v1/;
-/include/ "sun4i-a10.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun4i-a10.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "PineRiver Mini X-Plus";

+ 2 - 2
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts

@@ -46,8 +46,8 @@
  */
 
 /dts-v1/;
-/include/ "sun4i-a10.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun4i-a10.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Olimex A10-OLinuXino-LIME";

+ 2 - 2
arch/arm/boot/dts/sun4i-a10-pcduino.dts

@@ -47,8 +47,8 @@
  */
 
 /dts-v1/;
-/include/ "sun4i-a10.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun4i-a10.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "LinkSprite pcDuino";

+ 1 - 1
arch/arm/boot/dts/sun4i-a10.dtsi

@@ -10,7 +10,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	interrupt-parent = <&intc>;

+ 2 - 2
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts

@@ -46,8 +46,8 @@
  */
 
 /dts-v1/;
-/include/ "sun5i-a10s.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun5i-a10s.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "R7 A10s hdmi tv-stick";

+ 1 - 1
arch/arm/boot/dts/sun5i-a10s.dtsi

@@ -11,7 +11,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	interrupt-parent = <&intc>;

+ 2 - 2
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts

@@ -46,8 +46,8 @@
  */
 
 /dts-v1/;
-/include/ "sun5i-a13.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun5i-a13.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "HSG H702";

+ 2 - 2
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts

@@ -47,8 +47,8 @@
  */
 
 /dts-v1/;
-/include/ "sun5i-a13.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun5i-a13.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Olimex A13-Olinuxino Micro";

+ 1 - 1
arch/arm/boot/dts/sun5i-a13.dtsi

@@ -11,7 +11,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	interrupt-parent = <&intc>;

+ 2 - 2
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts

@@ -48,8 +48,8 @@
  */
 
 /dts-v1/;
-/include/ "sun6i-a31.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun6i-a31.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Allwinner A31 APP4 EVB1 Evaluation Board";

+ 2 - 2
arch/arm/boot/dts/sun6i-a31-colombus.dts

@@ -48,8 +48,8 @@
  */
 
 /dts-v1/;
-/include/ "sun6i-a31.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun6i-a31.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "WITS A31 Colombus Evaluation Board";

+ 2 - 2
arch/arm/boot/dts/sun6i-a31-hummingbird.dts

@@ -48,8 +48,8 @@
  */
 
 /dts-v1/;
-/include/ "sun6i-a31.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun6i-a31.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Merrii A31 Hummingbird";

+ 2 - 2
arch/arm/boot/dts/sun6i-a31-m9.dts

@@ -46,8 +46,8 @@
  */
 
 /dts-v1/;
-/include/ "sun6i-a31.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun6i-a31.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Mele M9 / A1000G Quad top set box";

+ 1 - 1
arch/arm/boot/dts/sun6i-a31.dtsi

@@ -47,7 +47,7 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	interrupt-parent = <&gic>;

+ 1 - 1
arch/arm/boot/dts/sun6i-a31s-cs908.dts

@@ -46,7 +46,7 @@
  */
 
 /dts-v1/;
-/include/ "sun6i-a31s.dtsi"
+#include "sun6i-a31s.dtsi"
 
 / {
 	model = "CSQ CS908 top set box";

+ 1 - 1
arch/arm/boot/dts/sun6i-a31s.dtsi

@@ -51,7 +51,7 @@
  * identical.
  */
 
-/include/ "sun6i-a31.dtsi"
+#include "sun6i-a31.dtsi"
 
 &pio {
 	compatible = "allwinner,sun6i-a31s-pinctrl";

+ 2 - 2
arch/arm/boot/dts/sun7i-a20-bananapi.dts

@@ -48,8 +48,8 @@
  */
 
 /dts-v1/;
-/include/ "sun7i-a20.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "LeMaker Banana Pi";

+ 2 - 2
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts

@@ -12,8 +12,8 @@
  */
 
 /dts-v1/;
-/include/ "sun7i-a20.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Cubietech Cubieboard2";

+ 2 - 2
arch/arm/boot/dts/sun7i-a20-cubietruck.dts

@@ -12,8 +12,8 @@
  */
 
 /dts-v1/;
-/include/ "sun7i-a20.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Cubietech Cubietruck";

+ 2 - 2
arch/arm/boot/dts/sun7i-a20-hummingbird.dts

@@ -12,8 +12,8 @@
  */
 
 /dts-v1/;
-/include/ "sun7i-a20.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Merrii A20 Hummingbird";

+ 2 - 2
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts

@@ -46,8 +46,8 @@
  */
 
 /dts-v1/;
-/include/ "sun7i-a20.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "I12 / Q5 / QT840A A20 tvbox";

+ 2 - 2
arch/arm/boot/dts/sun7i-a20-m3.dts

@@ -48,8 +48,8 @@
  */
 
 /dts-v1/;
-/include/ "sun7i-a20.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Mele M3";

+ 2 - 2
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts

@@ -49,8 +49,8 @@
  */
 
 /dts-v1/;
-/include/ "sun7i-a20.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Olimex A20-OLinuXino-LIME";

+ 2 - 2
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts

@@ -46,8 +46,8 @@
  */
 
 /dts-v1/;
-/include/ "sun7i-a20.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Olimex A20-OLinuXino-LIME2";

+ 3 - 2
arch/arm/boot/dts/sun7i-a20-pcduino3.dts

@@ -47,8 +47,9 @@
  */
 
 /dts-v1/;
-/include/ "sun7i-a20.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 

+ 1 - 1
arch/arm/boot/dts/sun7i-a20.dtsi

@@ -47,7 +47,7 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	interrupt-parent = <&gic>;

+ 2 - 2
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts

@@ -48,8 +48,8 @@
  */
 
 /dts-v1/;
-/include/ "sun8i-a23.dtsi"
-/include/ "sunxi-common-regulators.dtsi"
+#include "sun8i-a23.dtsi"
+#include "sunxi-common-regulators.dtsi"
 
 / {
 	model = "Ippo Q8H Dual Core Tablet (v5)";

+ 1 - 1
arch/arm/boot/dts/sun8i-a23.dtsi

@@ -47,7 +47,7 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	interrupt-parent = <&gic>;

+ 1 - 1
arch/arm/boot/dts/sun9i-a80-optimus.dts

@@ -48,7 +48,7 @@
  */
 
 /dts-v1/;
-/include/ "sun9i-a80.dtsi"
+#include "sun9i-a80.dtsi"
 
 / {
 	model = "Merrii A80 Optimus Board";

+ 1 - 1
arch/arm/boot/dts/sun9i-a80.dtsi

@@ -47,7 +47,7 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/include/ "skeleton64.dtsi"
+#include "skeleton64.dtsi"
 
 / {
 	interrupt-parent = <&gic>;