tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 71455701 721c259a

+61 -60
+2 -2
arch/arm/boot/dts/sun4i-a10-a1000.dts
··· 48 48 */ 49 49 50 50 /dts-v1/; 51 - /include/ "sun4i-a10.dtsi" 52 - /include/ "sunxi-common-regulators.dtsi" 51 + #include "sun4i-a10.dtsi" 52 + #include "sunxi-common-regulators.dtsi" 53 53 54 54 / { 55 55 model = "Mele A1000";
+2 -2
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
··· 46 46 */ 47 47 48 48 /dts-v1/; 49 - /include/ "sun4i-a10.dtsi" 50 - /include/ "sunxi-common-regulators.dtsi" 49 + #include "sun4i-a10.dtsi" 50 + #include "sunxi-common-regulators.dtsi" 51 51 52 52 / { 53 53 model = "BA10 tvbox";
+2 -2
arch/arm/boot/dts/sun4i-a10-cubieboard.dts
··· 47 47 */ 48 48 49 49 /dts-v1/; 50 - /include/ "sun4i-a10.dtsi" 51 - /include/ "sunxi-common-regulators.dtsi" 50 + #include "sun4i-a10.dtsi" 51 + #include "sunxi-common-regulators.dtsi" 52 52 53 53 / { 54 54 model = "Cubietech Cubieboard";
+2 -2
arch/arm/boot/dts/sun4i-a10-hackberry.dts
··· 48 48 */ 49 49 50 50 /dts-v1/; 51 - /include/ "sun4i-a10.dtsi" 52 - /include/ "sunxi-common-regulators.dtsi" 51 + #include "sun4i-a10.dtsi" 52 + #include "sunxi-common-regulators.dtsi" 53 53 54 54 / { 55 55 model = "Miniand Hackberry";
+2 -2
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
··· 48 48 */ 49 49 50 50 /dts-v1/; 51 - /include/ "sun4i-a10.dtsi" 52 - /include/ "sunxi-common-regulators.dtsi" 51 + #include "sun4i-a10.dtsi" 52 + #include "sunxi-common-regulators.dtsi" 53 53 54 54 / { 55 55 model = "INet-97F Rev 02";
+2 -2
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
··· 48 48 */ 49 49 50 50 /dts-v1/; 51 - /include/ "sun4i-a10.dtsi" 52 - /include/ "sunxi-common-regulators.dtsi" 51 + #include "sun4i-a10.dtsi" 52 + #include "sunxi-common-regulators.dtsi" 53 53 54 54 / { 55 55 model = "PineRiver Mini X-Plus";
+2 -2
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
··· 46 46 */ 47 47 48 48 /dts-v1/; 49 - /include/ "sun4i-a10.dtsi" 50 - /include/ "sunxi-common-regulators.dtsi" 49 + #include "sun4i-a10.dtsi" 50 + #include "sunxi-common-regulators.dtsi" 51 51 52 52 / { 53 53 model = "Olimex A10-OLinuXino-LIME";
+2 -2
arch/arm/boot/dts/sun4i-a10-pcduino.dts
··· 47 47 */ 48 48 49 49 /dts-v1/; 50 - /include/ "sun4i-a10.dtsi" 51 - /include/ "sunxi-common-regulators.dtsi" 50 + #include "sun4i-a10.dtsi" 51 + #include "sunxi-common-regulators.dtsi" 52 52 53 53 / { 54 54 model = "LinkSprite pcDuino";
+1 -1
arch/arm/boot/dts/sun4i-a10.dtsi
··· 10 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 16 interrupt-parent = <&intc>;
+2 -2
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
··· 46 46 */ 47 47 48 48 /dts-v1/; 49 - /include/ "sun5i-a10s.dtsi" 50 - /include/ "sunxi-common-regulators.dtsi" 49 + #include "sun5i-a10s.dtsi" 50 + #include "sunxi-common-regulators.dtsi" 51 51 52 52 / { 53 53 model = "R7 A10s hdmi tv-stick";
+1 -1
arch/arm/boot/dts/sun5i-a10s.dtsi
··· 11 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 17 interrupt-parent = <&intc>;
+2 -2
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
··· 46 46 */ 47 47 48 48 /dts-v1/; 49 - /include/ "sun5i-a13.dtsi" 50 - /include/ "sunxi-common-regulators.dtsi" 49 + #include "sun5i-a13.dtsi" 50 + #include "sunxi-common-regulators.dtsi" 51 51 52 52 / { 53 53 model = "HSG H702";
+2 -2
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
··· 47 47 */ 48 48 49 49 /dts-v1/; 50 - /include/ "sun5i-a13.dtsi" 51 - /include/ "sunxi-common-regulators.dtsi" 50 + #include "sun5i-a13.dtsi" 51 + #include "sunxi-common-regulators.dtsi" 52 52 53 53 / { 54 54 model = "Olimex A13-Olinuxino Micro";
+1 -1
arch/arm/boot/dts/sun5i-a13.dtsi
··· 11 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 17 interrupt-parent = <&intc>;
+2 -2
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
··· 48 48 */ 49 49 50 50 /dts-v1/; 51 - /include/ "sun6i-a31.dtsi" 52 - /include/ "sunxi-common-regulators.dtsi" 51 + #include "sun6i-a31.dtsi" 52 + #include "sunxi-common-regulators.dtsi" 53 53 54 54 / { 55 55 model = "Allwinner A31 APP4 EVB1 Evaluation Board";
+2 -2
arch/arm/boot/dts/sun6i-a31-colombus.dts
··· 48 48 */ 49 49 50 50 /dts-v1/; 51 - /include/ "sun6i-a31.dtsi" 52 - /include/ "sunxi-common-regulators.dtsi" 51 + #include "sun6i-a31.dtsi" 52 + #include "sunxi-common-regulators.dtsi" 53 53 54 54 / { 55 55 model = "WITS A31 Colombus Evaluation Board";
+2 -2
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
··· 48 48 */ 49 49 50 50 /dts-v1/; 51 - /include/ "sun6i-a31.dtsi" 52 - /include/ "sunxi-common-regulators.dtsi" 51 + #include "sun6i-a31.dtsi" 52 + #include "sunxi-common-regulators.dtsi" 53 53 54 54 / { 55 55 model = "Merrii A31 Hummingbird";
+2 -2
arch/arm/boot/dts/sun6i-a31-m9.dts
··· 46 46 */ 47 47 48 48 /dts-v1/; 49 - /include/ "sun6i-a31.dtsi" 50 - /include/ "sunxi-common-regulators.dtsi" 49 + #include "sun6i-a31.dtsi" 50 + #include "sunxi-common-regulators.dtsi" 51 51 52 52 / { 53 53 model = "Mele M9 / A1000G Quad top set box";
+1 -1
arch/arm/boot/dts/sun6i-a31.dtsi
··· 47 47 * OTHER DEALINGS IN THE SOFTWARE. 48 48 */ 49 49 50 - /include/ "skeleton.dtsi" 50 + #include "skeleton.dtsi" 51 51 52 52 / { 53 53 interrupt-parent = <&gic>;
+1 -1
arch/arm/boot/dts/sun6i-a31s-cs908.dts
··· 46 46 */ 47 47 48 48 /dts-v1/; 49 - /include/ "sun6i-a31s.dtsi" 49 + #include "sun6i-a31s.dtsi" 50 50 51 51 / { 52 52 model = "CSQ CS908 top set box";
+1 -1
arch/arm/boot/dts/sun6i-a31s.dtsi
··· 51 51 * identical. 52 52 */ 53 53 54 - /include/ "sun6i-a31.dtsi" 54 + #include "sun6i-a31.dtsi" 55 55 56 56 &pio { 57 57 compatible = "allwinner,sun6i-a31s-pinctrl";
+2 -2
arch/arm/boot/dts/sun7i-a20-bananapi.dts
··· 48 48 */ 49 49 50 50 /dts-v1/; 51 - /include/ "sun7i-a20.dtsi" 52 - /include/ "sunxi-common-regulators.dtsi" 51 + #include "sun7i-a20.dtsi" 52 + #include "sunxi-common-regulators.dtsi" 53 53 54 54 / { 55 55 model = "LeMaker Banana Pi";
+2 -2
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
··· 12 12 */ 13 13 14 14 /dts-v1/; 15 - /include/ "sun7i-a20.dtsi" 16 - /include/ "sunxi-common-regulators.dtsi" 15 + #include "sun7i-a20.dtsi" 16 + #include "sunxi-common-regulators.dtsi" 17 17 18 18 / { 19 19 model = "Cubietech Cubieboard2";
+2 -2
arch/arm/boot/dts/sun7i-a20-cubietruck.dts
··· 12 12 */ 13 13 14 14 /dts-v1/; 15 - /include/ "sun7i-a20.dtsi" 16 - /include/ "sunxi-common-regulators.dtsi" 15 + #include "sun7i-a20.dtsi" 16 + #include "sunxi-common-regulators.dtsi" 17 17 18 18 / { 19 19 model = "Cubietech Cubietruck";
+2 -2
arch/arm/boot/dts/sun7i-a20-hummingbird.dts
··· 12 12 */ 13 13 14 14 /dts-v1/; 15 - /include/ "sun7i-a20.dtsi" 16 - /include/ "sunxi-common-regulators.dtsi" 15 + #include "sun7i-a20.dtsi" 16 + #include "sunxi-common-regulators.dtsi" 17 17 18 18 / { 19 19 model = "Merrii A20 Hummingbird";
+2 -2
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
··· 46 46 */ 47 47 48 48 /dts-v1/; 49 - /include/ "sun7i-a20.dtsi" 50 - /include/ "sunxi-common-regulators.dtsi" 49 + #include "sun7i-a20.dtsi" 50 + #include "sunxi-common-regulators.dtsi" 51 51 52 52 / { 53 53 model = "I12 / Q5 / QT840A A20 tvbox";
+2 -2
arch/arm/boot/dts/sun7i-a20-m3.dts
··· 48 48 */ 49 49 50 50 /dts-v1/; 51 - /include/ "sun7i-a20.dtsi" 52 - /include/ "sunxi-common-regulators.dtsi" 51 + #include "sun7i-a20.dtsi" 52 + #include "sunxi-common-regulators.dtsi" 53 53 54 54 / { 55 55 model = "Mele M3";
+2 -2
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
··· 49 49 */ 50 50 51 51 /dts-v1/; 52 - /include/ "sun7i-a20.dtsi" 53 - /include/ "sunxi-common-regulators.dtsi" 52 + #include "sun7i-a20.dtsi" 53 + #include "sunxi-common-regulators.dtsi" 54 54 55 55 / { 56 56 model = "Olimex A20-OLinuXino-LIME";
+2 -2
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
··· 46 46 */ 47 47 48 48 /dts-v1/; 49 - /include/ "sun7i-a20.dtsi" 50 - /include/ "sunxi-common-regulators.dtsi" 49 + #include "sun7i-a20.dtsi" 50 + #include "sunxi-common-regulators.dtsi" 51 51 52 52 / { 53 53 model = "Olimex A20-OLinuXino-LIME2";
+3 -2
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
··· 47 47 */ 48 48 49 49 /dts-v1/; 50 - /include/ "sun7i-a20.dtsi" 51 - /include/ "sunxi-common-regulators.dtsi" 50 + #include "sun7i-a20.dtsi" 51 + #include "sunxi-common-regulators.dtsi" 52 + 52 53 #include <dt-bindings/gpio/gpio.h> 53 54 #include <dt-bindings/input/input.h> 54 55
+1 -1
arch/arm/boot/dts/sun7i-a20.dtsi
··· 47 47 * OTHER DEALINGS IN THE SOFTWARE. 48 48 */ 49 49 50 - /include/ "skeleton.dtsi" 50 + #include "skeleton.dtsi" 51 51 52 52 / { 53 53 interrupt-parent = <&gic>;
+2 -2
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
··· 48 48 */ 49 49 50 50 /dts-v1/; 51 - /include/ "sun8i-a23.dtsi" 52 - /include/ "sunxi-common-regulators.dtsi" 51 + #include "sun8i-a23.dtsi" 52 + #include "sunxi-common-regulators.dtsi" 53 53 54 54 / { 55 55 model = "Ippo Q8H Dual Core Tablet (v5)";
+1 -1
arch/arm/boot/dts/sun8i-a23.dtsi
··· 47 47 * OTHER DEALINGS IN THE SOFTWARE. 48 48 */ 49 49 50 - /include/ "skeleton.dtsi" 50 + #include "skeleton.dtsi" 51 51 52 52 / { 53 53 interrupt-parent = <&gic>;
+1 -1
arch/arm/boot/dts/sun9i-a80-optimus.dts
··· 48 48 */ 49 49 50 50 /dts-v1/; 51 - /include/ "sun9i-a80.dtsi" 51 + #include "sun9i-a80.dtsi" 52 52 53 53 / { 54 54 model = "Merrii A80 Optimus Board";
+1 -1
arch/arm/boot/dts/sun9i-a80.dtsi
··· 47 47 * OTHER DEALINGS IN THE SOFTWARE. 48 48 */ 49 49 50 - /include/ "skeleton64.dtsi" 50 + #include "skeleton64.dtsi" 51 51 52 52 / { 53 53 interrupt-parent = <&gic>;