Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivi...

[cascardo/linux.git] / arch / arm / boot / dts / imx6q-phytec-pbab01.dts

diff --git a/arch/arm/boot/dts/imx6q-phytec-pbab01.dts b/arch/arm/boot/dts/imx6q-phytec-pbab01.dts
index 5607c33..c139ac0 100644 (file)
--- a/arch/arm/boot/dts/imx6q-phytec-pbab01.dts
+++ b/arch/arm/boot/dts/imx6q-phytec-pbab01.dts
@@ -11,40 +11,17 @@
 
 /dts-v1/;
 #include "imx6q-phytec-pfla02.dtsi"
+#include "imx6qdl-phytec-pbab01.dtsi"
 
 / {
        model = "Phytec phyFLEX-i.MX6 Quad Carrier-Board";
        compatible = "phytec,imx6q-pbab01", "phytec,imx6q-pfla02", "fsl,imx6q";
-};
-
-&fec {
-       status = "okay";
-};
 
-&gpmi {
-       status = "okay";
+       chosen {
+               stdout-path = &uart4;
+       };
 };
 
 &sata {
-       status = "okay";
-};
-
-&uart4 {
-       status = "okay";
-};
-
-&usbh1 {
-       status = "okay";
-};
-
-&usbotg {
-       status = "okay";
-};
-
-&usdhc2 {
-       status = "okay";
-};
-
-&usdhc3 {
-       status = "okay";
+        status = "okay";
 };