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 d3f2fb7c6c1ea6ffc77b74c65f45acfa1179b91d..3e0897c3a29639d190022ced7732c8a7216864cd 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 9bf7111d7b0089b98a14296391ec7737784bc121..d6da984e518d42d3c6c8937e76bbd902f63f7c25 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 afc1e01197833181df8712ee8f7b417818bed8a4..fac7428685b47e0d47a5ad3c998a6dae992a4a8c 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 4fb97b0fe30bedb17644f8dc4f441b19f2dc0940..2a0d0fc3b9d6593e6937454df1441abaa78ca476 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 b4f65e8c5857d55a71553bb75cf1bc34d7499483..c7da5b41966fa94f7e1a3eb61789a5dd27ba76e1 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 1d64d1a5d8a798bab15a8d0fa1c1cd4e2dc32420..917f5dbe64ba37fd1007d47f9a47fc038794e21e 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 ce02f8a9ddd39b263d0b8c77aef5fbd66dcb6bcc..ed89d07beae5eb24f1f285538c0376524a45778f 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 5ac1aa298ce726fbc3537dc6f2529e62a9ea5632..e632532547545228198ecafb933b59175b9a1731 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";
+};