Skip to content

L
linux
Commit 98ef7957 authored by Florian Vaussard's avatar Florian Vaussard Committed by Benoit Cousson
Browse files
Options

ARM: dts: OMAP2+: Use #include for all device trees 

Replace /include/ by #include for OMAP2+ DT, in order to use the
C pre-processor, making use of #define features possible.
Signed-off-by: default avatarFlorian Vaussard <florian.vaussard@epfl.ch>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarBenoit Cousson <benoit.cousson@linaro.org>
parent fdc6a2dd
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 44 deletions
arch/arm/boot/dts/omap2.dtsi
View file @ 98ef7957
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* kind, whether express or implied. * kind, whether express or implied.
*/ */
/include/ "skeleton.dtsi" #include "skeleton.dtsi"
/ { / {
compatible = "ti,omap2430", "ti,omap2420", "ti,omap2"; compatible = "ti,omap2430", "ti,omap2420", "ti,omap2";
......
arch/arm/boot/dts/omap2420-h4.dts
View file @ 98ef7957
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap2420.dtsi" #include "omap2420.dtsi"
/ { / {
model = "TI OMAP2420 H4 board"; model = "TI OMAP2420 H4 board";
......
arch/arm/boot/dts/omap2420.dtsi
View file @ 98ef7957
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* kind, whether express or implied. * kind, whether express or implied.
*/ */
/include/ "omap2.dtsi" #include "omap2.dtsi"
/ { / {
compatible = "ti,omap2420", "ti,omap2"; compatible = "ti,omap2420", "ti,omap2";
......
arch/arm/boot/dts/omap2430.dtsi
View file @ 98ef7957
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* kind, whether express or implied. * kind, whether express or implied.
*/ */
/include/ "omap2.dtsi" #include "omap2.dtsi"
/ { / {
compatible = "ti,omap2430", "ti,omap2"; compatible = "ti,omap2430", "ti,omap2";
......
arch/arm/boot/dts/omap3-beagle-xm.dts
View file @ 98ef7957
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap36xx.dtsi" #include "omap36xx.dtsi"
/ { / {
model = "TI OMAP3 BeagleBoard xM"; model = "TI OMAP3 BeagleBoard xM";
...@@ -75,7 +75,7 @@ codec { ...@@ -75,7 +75,7 @@ codec {
}; };
}; };
/include/ "twl4030.dtsi" #include "twl4030.dtsi"
&i2c2 { &i2c2 {
clock-frequency = <400000>; clock-frequency = <400000>;
......
arch/arm/boot/dts/omap3-beagle.dts
View file @ 98ef7957
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap34xx.dtsi" #include "omap34xx.dtsi"
/ { / {
model = "TI OMAP3 BeagleBoard"; model = "TI OMAP3 BeagleBoard";
...@@ -107,7 +107,7 @@ twl: twl@48 { ...@@ -107,7 +107,7 @@ twl: twl@48 {
}; };
}; };
/include/ "twl4030.dtsi" #include "twl4030.dtsi"
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
......
arch/arm/boot/dts/omap3-devkit8000.dts
View file @ 98ef7957
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap34xx.dtsi" #include "omap34xx.dtsi"
/ { / {
model = "TimLL OMAP3 Devkit8000"; model = "TimLL OMAP3 Devkit8000";
compatible = "timll,omap3-devkit8000", "ti,omap3"; compatible = "timll,omap3-devkit8000", "ti,omap3";
...@@ -80,7 +80,7 @@ &i2c3 { ...@@ -80,7 +80,7 @@ &i2c3 {
status = "disabled"; status = "disabled";
}; };
/include/ "twl4030.dtsi" #include "twl4030.dtsi"
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
......
arch/arm/boot/dts/omap3-evm.dts
View file @ 98ef7957
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap34xx.dtsi" #include "omap34xx.dtsi"
/ { / {
model = "TI OMAP3 EVM (OMAP3530, AM/DM37x)"; model = "TI OMAP3 EVM (OMAP3530, AM/DM37x)";
...@@ -44,7 +44,7 @@ twl: twl@48 { ...@@ -44,7 +44,7 @@ twl: twl@48 {
}; };
}; };
/include/ "twl4030.dtsi" #include "twl4030.dtsi"
&i2c2 { &i2c2 {
clock-frequency = <400000>; clock-frequency = <400000>;
......
arch/arm/boot/dts/omap3-igep.dtsi
View file @ 98ef7957
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap34xx.dtsi" #include "omap34xx.dtsi"
/ { / {
memory { memory {
...@@ -86,7 +86,7 @@ codec { ...@@ -86,7 +86,7 @@ codec {
}; };
}; };
/include/ "twl4030.dtsi" #include "twl4030.dtsi"
&i2c2 { &i2c2 {
clock-frequency = <400000>; clock-frequency = <400000>;
......
arch/arm/boot/dts/omap3-igep0020.dts
View file @ 98ef7957
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
/include/ "omap3-igep.dtsi" #include "omap3-igep.dtsi"
/ { / {
model = "IGEPv2"; model = "IGEPv2";
......
arch/arm/boot/dts/omap3-igep0030.dts
View file @ 98ef7957
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
/include/ "omap3-igep.dtsi" #include "omap3-igep.dtsi"
/ { / {
model = "IGEP COM Module"; model = "IGEP COM Module";
......
arch/arm/boot/dts/omap3-overo.dtsi
View file @ 98ef7957
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap34xx.dtsi" #include "omap34xx.dtsi"
/ { / {
pwmleds { pwmleds {
...@@ -49,7 +49,7 @@ codec { ...@@ -49,7 +49,7 @@ codec {
}; };
}; };
/include/ "twl4030.dtsi" #include "twl4030.dtsi"
/* i2c2 pins are used for gpio */ /* i2c2 pins are used for gpio */
&i2c2 { &i2c2 {
......
arch/arm/boot/dts/omap3-tobi.dts
View file @ 98ef7957
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Tobi expansion board is manufactured by Gumstix Inc. * Tobi expansion board is manufactured by Gumstix Inc.
*/ */
/include/ "omap3-overo.dtsi" #include "omap3-overo.dtsi"
/ { / {
model = "TI OMAP3 Gumstix Overo on Tobi"; model = "TI OMAP3 Gumstix Overo on Tobi";
......
arch/arm/boot/dts/omap3.dtsi
View file @ 98ef7957
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* kind, whether express or implied. * kind, whether express or implied.
*/ */
/include/ "skeleton.dtsi" #include "skeleton.dtsi"
/ { / {
compatible = "ti,omap3430", "ti,omap3"; compatible = "ti,omap3430", "ti,omap3";
......
arch/arm/boot/dts/omap3430-sdp.dts
View file @ 98ef7957
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap34xx.dtsi" #include "omap34xx.dtsi"
/ { / {
model = "TI OMAP3430 SDP"; model = "TI OMAP3430 SDP";
...@@ -28,7 +28,7 @@ twl: twl@48 { ...@@ -28,7 +28,7 @@ twl: twl@48 {
}; };
}; };
/include/ "twl4030.dtsi" #include "twl4030.dtsi"
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
......
arch/arm/boot/dts/omap34xx.dtsi
View file @ 98ef7957
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* kind, whether express or implied. * kind, whether express or implied.
*/ */
/include/ "omap3.dtsi" #include "omap3.dtsi"
/ { / {
cpus { cpus {
......
arch/arm/boot/dts/omap36xx.dtsi
View file @ 98ef7957
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* kind, whether express or implied. * kind, whether express or implied.
*/ */
/include/ "omap3.dtsi" #include "omap3.dtsi"
/ { / {
aliases { aliases {
......
arch/arm/boot/dts/omap4-panda-a4.dts
View file @ 98ef7957
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap443x.dtsi" #include "omap443x.dtsi"
/include/ "omap4-panda-common.dtsi" #include "omap4-panda-common.dtsi"
/* Pandaboard Rev A4+ have external pullups on SCL & SDA */ /* Pandaboard Rev A4+ have external pullups on SCL & SDA */
&dss_hdmi_pins { &dss_hdmi_pins {
......
arch/arm/boot/dts/omap4-panda-common.dtsi
View file @ 98ef7957
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
/include/ "elpida_ecb240abacn.dtsi" #include "elpida_ecb240abacn.dtsi"
/ { / {
model = "TI OMAP4 PandaBoard"; model = "TI OMAP4 PandaBoard";
...@@ -184,7 +184,7 @@ twl6040: twl@4b { ...@@ -184,7 +184,7 @@ twl6040: twl@4b {
}; };
}; };
/include/ "twl6030.dtsi" #include "twl6030.dtsi"
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
......
arch/arm/boot/dts/omap4-panda-es.dts
View file @ 98ef7957
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap4460.dtsi" #include "omap4460.dtsi"
/include/ "omap4-panda-common.dtsi" #include "omap4-panda-common.dtsi"
/* Audio routing is differnet between PandaBoard4430 and PandaBoardES */ /* Audio routing is differnet between PandaBoard4430 and PandaBoardES */
&sound { &sound {
......
arch/arm/boot/dts/omap4-panda.dts
View file @ 98ef7957
...@@ -7,5 +7,5 @@ ...@@ -7,5 +7,5 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap443x.dtsi" #include "omap443x.dtsi"
/include/ "omap4-panda-common.dtsi" #include "omap4-panda-common.dtsi"
arch/arm/boot/dts/omap4-sdp-es23plus.dts
View file @ 98ef7957
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
/include/ "omap4-sdp.dts" #include "omap4-sdp.dts"
/* SDP boards with 4430 ES2.3+ or 4460 have external pullups on SCL & SDA */ /* SDP boards with 4430 ES2.3+ or 4460 have external pullups on SCL & SDA */
&dss_hdmi_pins { &dss_hdmi_pins {
......
arch/arm/boot/dts/omap4-sdp.dts
View file @ 98ef7957
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap443x.dtsi" #include "omap443x.dtsi"
/include/ "elpida_ecb240abacn.dtsi" #include "elpida_ecb240abacn.dtsi"
/ { / {
model = "TI OMAP4 SDP board"; model = "TI OMAP4 SDP board";
...@@ -336,7 +336,7 @@ vibra { ...@@ -336,7 +336,7 @@ vibra {
}; };
}; };
/include/ "twl6030.dtsi" #include "twl6030.dtsi"
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
......
arch/arm/boot/dts/omap4-var-som.dts
View file @ 98ef7957
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap443x.dtsi" #include "omap443x.dtsi"
/ { / {
model = "Variscite OMAP4 SOM"; model = "Variscite OMAP4 SOM";
...@@ -39,7 +39,7 @@ twl: twl@48 { ...@@ -39,7 +39,7 @@ twl: twl@48 {
}; };
}; };
/include/ "twl6030.dtsi" #include "twl6030.dtsi"
&i2c2 { &i2c2 {
clock-frequency = <400000>; clock-frequency = <400000>;
......
arch/arm/boot/dts/omap4.dtsi
View file @ 98ef7957
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
/include/ "skeleton.dtsi" #include "skeleton.dtsi"
/ { / {
compatible = "ti,omap4430", "ti,omap4"; compatible = "ti,omap4430", "ti,omap4";
......
arch/arm/boot/dts/omap443x.dtsi
View file @ 98ef7957
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* kind, whether express or implied. * kind, whether express or implied.
*/ */
/include/ "omap4.dtsi" #include "omap4.dtsi"
/ { / {
cpus { cpus {
......
arch/arm/boot/dts/omap4460.dtsi
View file @ 98ef7957
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* version 2. This program is licensed "as is" without any warranty of any * version 2. This program is licensed "as is" without any warranty of any
* kind, whether express or implied. * kind, whether express or implied.
*/ */
/include/ "omap4.dtsi" #include "omap4.dtsi"
/ { / {
cpus { cpus {
......
arch/arm/boot/dts/omap5-evm.dts
View file @ 98ef7957
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "omap5.dtsi" #include "omap5.dtsi"
/include/ "samsung_k3pe0e000b.dtsi" #include "samsung_k3pe0e000b.dtsi"
/ { / {
model = "TI OMAP5 EVM board"; model = "TI OMAP5 EVM board";
......
arch/arm/boot/dts/omap5.dtsi
View file @ 98ef7957
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Based on "omap4.dtsi" * Based on "omap4.dtsi"
*/ */
/include/ "skeleton.dtsi" #include "skeleton.dtsi"
/ { / {
#address-cells = <1>; #address-cells = <1>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7