MLK-12678 ARM: dts: imx6ull-ddr3-arm2: solve pin conflict for pwm3 and otg1

The pwm3 and otg1 share the same pin 'GPIO1_IO04'. And default,
the pin is used for otg1. So create a new dts file to solve
this conflict.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 24085f6..8508a60 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -480,7 +480,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
        imx6ul-9x9-evk-csi.dtb \
        imx6ul-9x9-evk-ldo.dtb
 dtb-$(CONFIG_SOC_IMX6ULL) += \
-       imx6ull-ddr3-arm2.dtb
+       imx6ull-ddr3-arm2.dtb \
+       imx6ull-ddr3-arm2-lcdif.dtb
 dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-cl-som-imx7.dtb \
        imx7d-colibri-eval-v3.dtb \

diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2-lcdif.dts b/arch/arm/boot/dts/imx6ull-ddr3-arm2-lcdif.dts
new file mode 100644 (file)
index 0000000..8c30bb3
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-ddr3-arm2-lcdif.dts
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/* DTS file for LCDIF at imx6ull ddr3 arm2 board */
+
+#include "imx6ull-ddr3-arm2.dts"
+
+/ {
+       regulators {
+               reg_usb_otg1_vbus: regulator@2 {
+                       status = "disabled";
+               };
+       };
+
+       backlight {
+               compatible = "pwm-backlight";
+               pwms = <&pwm3 0 5000000>;
+               brightness-levels = <0 4 8 16 32 64 128 255>;
+               default-brightness-level = <6>;
+               status = "okay";
+       };
+};
+
+&lcdif {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_lcdif_dat
+                    &pinctrl_lcdif_ctrl>;
+       display = <&display0>;
+       status = "okay";
+
+       display0: display {
+               bits-per-pixel = <16>;
+               bus-width = <24>;
+
+               display-timings {
+                       native-mode = <&timing0>;
+                       timing0: timing0 {
+                               clock-frequency = <33500000>;
+                               hactive = <800>;
+                               vactive = <480>;
+                               hback-porch = <89>;
+                               hfront-porch = <164>;
+                               vback-porch = <23>;
+                               vfront-porch = <10>;
+                               hsync-len = <10>;
+                               vsync-len = <10>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+               };
+       };
+};
+
+&pwm3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm3>;
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/imx6ull-ddr3-arm2.dts b/arch/arm/boot/dts/imx6ull-ddr3-arm2.dts
index 3f5a3f4..eda2aee 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-ddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx6ull-ddr3-arm2.dts
@@ -15,14 +15,6 @@
        model = "Freescale i.MX6 ULL DDR3 ARM2 Board";
        compatible = "fsl,imx6ull-ddr3-arm2", "fsl,imx6ull";
 
-       backlight {
-               compatible = "pwm-backlight";
-               pwms = <&pwm3 0 5000000>;
-               brightness-levels = <0 4 8 16 32 64 128 255>;
-               default-brightness-level = <6>;
-               status = "okay";
-       };
-
        chosen {
                stdout-path = &uart1;
        };
@@ -855,44 +847,6 @@
        };
 };
 
-&lcdif {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lcdif_dat
-                    &pinctrl_lcdif_ctrl>;
-       display = <&display0>;
-       status = "disabled";
-
-       display0: display {
-               bits-per-pixel = <16>;
-               bus-width = <24>;
-
-               display-timings {
-                       native-mode = <&timing0>;
-                       timing0: timing0 {
-                               clock-frequency = <33500000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <89>;
-                               hfront-porch = <164>;
-                               vback-porch = <23>;
-                               vfront-porch = <10>;
-                               hsync-len = <10>;
-                               vsync-len = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-       };
-};
-
-&pwm3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_pwm3>;
-       status = "disabled";
-};
-
 &pxp {
        status = "okay";
 };