mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
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: Florian Vaussard <florian.vaussard@epfl.ch> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
This commit is contained in:
parent
fdc6a2ddd8
commit
98ef795714
29 changed files with 44 additions and 44 deletions
|
@ -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";
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
*/
|
*/
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
|
|
||||||
/include/ "omap2420.dtsi"
|
#include "omap2420.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "TI OMAP2420 H4 board";
|
model = "TI OMAP2420 H4 board";
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -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 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "twl4030.dtsi"
|
#include "twl4030.dtsi"
|
||||||
|
|
||||||
&i2c2 {
|
&i2c2 {
|
||||||
clock-frequency = <400000>;
|
clock-frequency = <400000>;
|
||||||
|
|
|
@ -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 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "twl4030.dtsi"
|
#include "twl4030.dtsi"
|
||||||
|
|
||||||
&mmc1 {
|
&mmc1 {
|
||||||
vmmc-supply = <&vmmc1>;
|
vmmc-supply = <&vmmc1>;
|
||||||
|
|
|
@ -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 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "twl4030.dtsi"
|
#include "twl4030.dtsi"
|
||||||
|
|
||||||
&mmc1 {
|
&mmc1 {
|
||||||
vmmc-supply = <&vmmc1>;
|
vmmc-supply = <&vmmc1>;
|
||||||
|
|
|
@ -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 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "twl4030.dtsi"
|
#include "twl4030.dtsi"
|
||||||
|
|
||||||
&i2c2 {
|
&i2c2 {
|
||||||
clock-frequency = <400000>;
|
clock-frequency = <400000>;
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
*/
|
*/
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
|
|
||||||
/include/ "omap34xx.dtsi"
|
#include "omap34xx.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
memory {
|
memory {
|
||||||
|
@ -86,7 +86,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "twl4030.dtsi"
|
#include "twl4030.dtsi"
|
||||||
|
|
||||||
&i2c2 {
|
&i2c2 {
|
||||||
clock-frequency = <400000>;
|
clock-frequency = <400000>;
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
*/
|
*/
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
|
|
||||||
/include/ "omap34xx.dtsi"
|
#include "omap34xx.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
pwmleds {
|
pwmleds {
|
||||||
|
@ -49,7 +49,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "twl4030.dtsi"
|
#include "twl4030.dtsi"
|
||||||
|
|
||||||
/* i2c2 pins are used for gpio */
|
/* i2c2 pins are used for gpio */
|
||||||
&i2c2 {
|
&i2c2 {
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -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 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "twl4030.dtsi"
|
#include "twl4030.dtsi"
|
||||||
|
|
||||||
&mmc1 {
|
&mmc1 {
|
||||||
vmmc-supply = <&vmmc1>;
|
vmmc-supply = <&vmmc1>;
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
* kind, whether express or implied.
|
* kind, whether express or implied.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/include/ "omap3.dtsi"
|
#include "omap3.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
cpus {
|
cpus {
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
* kind, whether express or implied.
|
* kind, whether express or implied.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/include/ "omap3.dtsi"
|
#include "omap3.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
aliases {
|
aliases {
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -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 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "twl6030.dtsi"
|
#include "twl6030.dtsi"
|
||||||
|
|
||||||
&i2c2 {
|
&i2c2 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -7,5 +7,5 @@
|
||||||
*/
|
*/
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
|
|
||||||
/include/ "omap443x.dtsi"
|
#include "omap443x.dtsi"
|
||||||
/include/ "omap4-panda-common.dtsi"
|
#include "omap4-panda-common.dtsi"
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -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 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "twl6030.dtsi"
|
#include "twl6030.dtsi"
|
||||||
|
|
||||||
&i2c2 {
|
&i2c2 {
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
|
|
@ -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 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
/include/ "twl6030.dtsi"
|
#include "twl6030.dtsi"
|
||||||
|
|
||||||
&i2c2 {
|
&i2c2 {
|
||||||
clock-frequency = <400000>;
|
clock-frequency = <400000>;
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
* kind, whether express or implied.
|
* kind, whether express or implied.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/include/ "omap4.dtsi"
|
#include "omap4.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
cpus {
|
cpus {
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
* Based on "omap4.dtsi"
|
* Based on "omap4.dtsi"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/include/ "skeleton.dtsi"
|
#include "skeleton.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
|
|
Loading…
Add table
Reference in a new issue