summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2016-03-15 20:33:36 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2016-03-16 08:23:46 +0100
commit4249f24e2cbbbfd146f638f82fb3a3a942474513 (patch)
tree98e73c338ec675fbb3712a67ecc4013f8e5d4209 /arch
parenta0fa6e1d2b6ac59ecb0cf531fb3b37fab636e336 (diff)
downloadbarebox-4249f24e2cbbbfd146f638f82fb3a3a942474513.tar.gz
barebox-4249f24e2cbbbfd146f638f82fb3a3a942474513.tar.xz
i.MX6: dts: Include local .dtsi's last
Make sure that Barebox specific .dtsi files are included after .dtsi files imported from Linux kernel. This way those local .dtsi files can reference phandles defined in Linux kernel files. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/imx6dl-cm-fx6.dts2
-rw-r--r--arch/arm/dts/imx6dl-dfi-fs700-m60-6s.dts2
-rw-r--r--arch/arm/dts/imx6dl-eltec-hipercam.dts2
-rw-r--r--arch/arm/dts/imx6dl-nitrogen6x.dts2
-rw-r--r--arch/arm/dts/imx6dl-phytec-pfla02.dtsi2
-rw-r--r--arch/arm/dts/imx6dl-sabrelite.dts2
-rw-r--r--arch/arm/dts/imx6dl-tqma6s.dtsi2
-rw-r--r--arch/arm/dts/imx6s-phytec-pfla02.dtsi2
-rw-r--r--arch/arm/dts/imx6s-riotboard.dts2
9 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/dts/imx6dl-cm-fx6.dts b/arch/arm/dts/imx6dl-cm-fx6.dts
index 0d96b46bf9..cc426e2a3c 100644
--- a/arch/arm/dts/imx6dl-cm-fx6.dts
+++ b/arch/arm/dts/imx6dl-cm-fx6.dts
@@ -12,8 +12,8 @@
*/
/dts-v1/;
-#include "imx6dl.dtsi"
#include <arm/imx6dl.dtsi>
+#include "imx6dl.dtsi"
#include "imx6qdl-cm-fx6.dtsi"
/ {
diff --git a/arch/arm/dts/imx6dl-dfi-fs700-m60-6s.dts b/arch/arm/dts/imx6dl-dfi-fs700-m60-6s.dts
index bee4c765d7..b6df37f373 100644
--- a/arch/arm/dts/imx6dl-dfi-fs700-m60-6s.dts
+++ b/arch/arm/dts/imx6dl-dfi-fs700-m60-6s.dts
@@ -14,8 +14,8 @@
/dts-v1/;
#endif
-#include "imx6dl.dtsi"
#include <arm/imx6dl.dtsi>
+#include "imx6dl.dtsi"
#include "imx6qdl-dfi-fs700-m60.dtsi"
/ {
diff --git a/arch/arm/dts/imx6dl-eltec-hipercam.dts b/arch/arm/dts/imx6dl-eltec-hipercam.dts
index 592358f0c8..f272e78a59 100644
--- a/arch/arm/dts/imx6dl-eltec-hipercam.dts
+++ b/arch/arm/dts/imx6dl-eltec-hipercam.dts
@@ -1,7 +1,7 @@
/dts-v1/;
-#include "imx6dl.dtsi"
#include <arm/imx6dl.dtsi>
+#include "imx6dl.dtsi"
/ {
model = "ELTEC HiPerCam";
diff --git a/arch/arm/dts/imx6dl-nitrogen6x.dts b/arch/arm/dts/imx6dl-nitrogen6x.dts
index 3ac9ff3a0d..50267b1038 100644
--- a/arch/arm/dts/imx6dl-nitrogen6x.dts
+++ b/arch/arm/dts/imx6dl-nitrogen6x.dts
@@ -12,8 +12,8 @@
*/
/dts-v1/;
-#include "imx6dl.dtsi"
#include <arm/imx6dl.dtsi>
+#include "imx6dl.dtsi"
#include "imx6qdl-nitrogen6x.dtsi"
/ {
diff --git a/arch/arm/dts/imx6dl-phytec-pfla02.dtsi b/arch/arm/dts/imx6dl-phytec-pfla02.dtsi
index e0541e00a9..d951c0bb8d 100644
--- a/arch/arm/dts/imx6dl-phytec-pfla02.dtsi
+++ b/arch/arm/dts/imx6dl-phytec-pfla02.dtsi
@@ -9,8 +9,8 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-#include "imx6dl.dtsi"
#include <arm/imx6dl.dtsi>
+#include "imx6dl.dtsi"
#include "imx6qdl-phytec-pfla02.dtsi"
/ {
diff --git a/arch/arm/dts/imx6dl-sabrelite.dts b/arch/arm/dts/imx6dl-sabrelite.dts
index 907ed282b7..849bcdd61a 100644
--- a/arch/arm/dts/imx6dl-sabrelite.dts
+++ b/arch/arm/dts/imx6dl-sabrelite.dts
@@ -11,8 +11,8 @@
*/
/dts-v1/;
-#include "imx6dl.dtsi"
#include <arm/imx6dl.dtsi>
+#include "imx6dl.dtsi"
#include "imx6qdl-sabrelite.dtsi"
/ {
diff --git a/arch/arm/dts/imx6dl-tqma6s.dtsi b/arch/arm/dts/imx6dl-tqma6s.dtsi
index 23081eda30..63459ce7ea 100644
--- a/arch/arm/dts/imx6dl-tqma6s.dtsi
+++ b/arch/arm/dts/imx6dl-tqma6s.dtsi
@@ -9,8 +9,8 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-#include "imx6dl.dtsi"
#include <arm/imx6dl.dtsi>
+#include "imx6dl.dtsi"
#include "imx6qdl-tqma6x.dtsi"
&iomuxc {
diff --git a/arch/arm/dts/imx6s-phytec-pfla02.dtsi b/arch/arm/dts/imx6s-phytec-pfla02.dtsi
index 25af12f2bc..7ef27fb941 100644
--- a/arch/arm/dts/imx6s-phytec-pfla02.dtsi
+++ b/arch/arm/dts/imx6s-phytec-pfla02.dtsi
@@ -9,8 +9,8 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-#include "imx6dl.dtsi"
#include <arm/imx6dl.dtsi>
+#include "imx6dl.dtsi"
#include "imx6qdl-phytec-pfla02.dtsi"
/ {
diff --git a/arch/arm/dts/imx6s-riotboard.dts b/arch/arm/dts/imx6s-riotboard.dts
index e14363f9af..3d0a930c3f 100644
--- a/arch/arm/dts/imx6s-riotboard.dts
+++ b/arch/arm/dts/imx6s-riotboard.dts
@@ -6,8 +6,8 @@
*/
/dts-v1/;
-#include "imx6dl.dtsi"
#include <arm/imx6dl.dtsi>
+#include "imx6dl.dtsi"
/ {
model = "RIoTboard Solo";