ARM: dts: colibri-imx6ull: enable default peripherals

For NAND modules Toradex does not provide any device-tree overlays. But
we always had a default display output enabled on NAND modules as well
as touchscreens that are placed on displays which can easily be plugged
into those carrier boards. Do reenable these displays and touchscreen
output on all device-trees that are used on NAND modules.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dts b/arch/arm/boot/dts/imx6ull-colibri-aster.dts
index d3f2fb7..3e0897c 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-colibri-aster.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-aster.dts
@@ -15,6 +15,46 @@
                     "fsl,imx6ull";
 };
 
+&ad7879_ts {
+       status = "okay";
+};
+
 &atmel_mxt_ts {
        status = "okay";
 };
+
+&backlight {
+       status = "okay";
+};
+
+&i2c1 {
+       status = "okay";
+};
+
+&i2c2 {
+       status = "okay";
+};
+
+&lcdif {
+       status = "okay";
+};
+
+&panel_dpi {
+       status = "okay";
+};
+
+&pwm4 {
+       status = "okay";
+};
+
+/* PWM <B> */
+&pwm5 {
+       /* Pin already used by atmel_mxt_ts touchscreen */
+       status = "disabled";
+};
+
+/* PWM <C> */
+&pwm6 {
+       /* Pin already used by atmel_mxt_ts touchscreen */
+       status = "disabled";
+};

diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts
index 9bf7111..d6da984 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts
@@ -12,3 +12,27 @@
        model = "Toradex Colibri iMX6ULL 256/512MB on Colibri Evaluation Board V3";
        compatible = "toradex,colibri-imx6ull-eval", "fsl,imx6ull";
 };
+
+&ad7879_ts {
+       status = "okay";
+};
+
+&backlight {
+       status = "okay";
+};
+
+&i2c2 {
+       status = "okay";
+};
+
+&lcdif {
+       status = "okay";
+};
+
+&panel_dpi {
+       status = "okay";
+};
+
+&pwm4 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts
index afc1e01..fac7428 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts
@@ -15,10 +15,18 @@
                     "fsl,imx6ull";
 };
 
+&ad7879_ts {
+       status = "okay";
+};
+
 &atmel_mxt_ts {
        status = "okay";
 };
 
+&backlight {
+       status = "okay";
+};
+
 &gpio1 {
        /* This turns the LVDS transceiver on */
        lvds-power-on {
@@ -63,3 +71,35 @@
                output-low;
        };
 };
+
+&i2c1 {
+       status = "okay";
+};
+
+&i2c2 {
+       status = "okay";
+};
+
+&lcdif {
+       status = "okay";
+};
+
+&panel_dpi {
+       status = "okay";
+};
+
+&pwm4 {
+       status = "okay";
+};
+
+/* PWM <B> */
+&pwm5 {
+       /* Pin already used by atmel_mxt_ts touchscreen */
+       status = "disabled";
+};
+
+/* PWM <C> */
+&pwm6 {
+       /* Pin already used by atmel_mxt_ts touchscreen */
+       status = "disabled";
+};

diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris.dts b/arch/arm/boot/dts/imx6ull-colibri-iris.dts
index 4fb97b0..2a0d0fc 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-colibri-iris.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-iris.dts
@@ -15,6 +15,26 @@
                     "fsl,imx6ull";
 };
 
-&atmel_mxt_ts {
+&ad7879_ts {
+       status = "okay";
+};
+
+&backlight {
+       status = "okay";
+};
+
+&i2c2 {
+       status = "okay";
+};
+
+&lcdif {
+       status = "okay";
+};
+
+&panel_dpi {
+       status = "okay";
+};
+
+&pwm4 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts
index b4f65e8..c7da5b4 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts
@@ -15,6 +15,46 @@
                     "fsl,imx6ull";
 };
 
+&ad7879_ts {
+       status = "okay";
+};
+
 &atmel_mxt_ts {
        status = "okay";
 };
+
+&backlight {
+       status = "okay";
+};
+
+&i2c1 {
+       status = "okay";
+};
+
+&i2c2 {
+       status = "okay";
+};
+
+&lcdif {
+       status = "okay";
+};
+
+&panel_dpi {
+       status = "okay";
+};
+
+&pwm4 {
+       status = "okay";
+};
+
+/* PWM <B> */
+&pwm5 {
+       /* Pin already used by atmel_mxt_ts touchscreen */
+       status = "disabled";
+};
+
+/* PWM <C> */
+&pwm6 {
+       /* Pin already used by atmel_mxt_ts touchscreen */
+       status = "disabled";
+};

diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts
index 1d64d1a..917f5db 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts
@@ -12,3 +12,27 @@
        model = "Toradex Colibri iMX6ULL 512MB on Colibri Evaluation Board V3";
        compatible = "toradex,colibri-imx6ull-wifi-eval", "fsl,imx6ull";
 };
+
+&ad7879_ts {
+       status = "okay";
+};
+
+&backlight {
+       status = "okay";
+};
+
+&i2c2 {
+       status = "okay";
+};
+
+&lcdif {
+       status = "okay";
+};
+
+&panel_dpi {
+       status = "okay";
+};
+
+&pwm4 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts
index ce02f8a..ed89d07 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts
@@ -15,10 +15,18 @@
                     "fsl,imx6ull";
 };
 
+&ad7879_ts {
+       status = "okay";
+};
+
 &atmel_mxt_ts {
        status = "okay";
 };
 
+&backlight {
+       status = "okay";
+};
+
 &gpio1 {
        /* This turns the LVDS transceiver on */
        lvds-power-on {
@@ -63,3 +71,19 @@
                output-low;
        };
 };
+
+&i2c2 {
+       status = "okay";
+};
+
+&lcdif {
+       status = "okay";
+};
+
+&panel_dpi {
+       status = "okay";
+};
+
+&pwm4 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts
index 5ac1aa2..e632532 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts
@@ -15,6 +15,26 @@
                     "fsl,imx6ull";
 };
 
+&ad7879_ts {
+       status = "okay";
+};
+
 &atmel_mxt_ts {
        status = "okay";
 };
+
+&backlight {
+       status = "okay";
+};
+
+&i2c2 {
+       status = "okay";
+};
+
+&lcdif {
+       status = "okay";
+};
+
+&panel_dpi {
+       status = "okay";
+};