ENGR00308478 ARM: dts: imx6sx-sdb: Add camera support via the camera adapter

Previously we support camera features via mx51 expansion board due to footprint
mirror issue on imx6sx sdb board. Now we switch to the adapter board
(sch700-28342) to support same features. And the support via mx51 expansion
board is deprecated.

The changes include
- Change the PINs setting for power and reset signal.
- Add status flag to avoid the conflict use of LCD1_RESET pin by LCDIF1/CSI.
  For LCDIF1, it's used as LCD_PWR_EN, for CSI/camera, as RESET pin.

Signed-off-by: Robby Cai <r63905@freescale.com>

3 files changed, 11 insertions, 4 deletions

diff --git a/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts b/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts
index dccbcb416769..b0661436ad23 100644
--- a/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts
@@ -12,6 +12,12 @@
         csi1_v4l2_cap {
                 status = "disabled";
         };
+
+        regulators {
+                reg_lcd_3v3: lcd-3v3 {
+                        status = "okay";
+                };
+        };
 };
 
 &csi1 {
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
index b8a51857b323..04f555a8ca0e 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -56,6 +56,7 @@
                         regulator-name = "lcd-3v3";
                         gpio = <&gpio3 27 0>;
                         enable-active-high;
+                        status = "disabled";
                 };
 
                 reg_sd3_vmmc: sd3_vmmc{
@@ -305,8 +306,8 @@
                 clock-names = "csi_mclk";
                 AVDD-supply = <&vgen3_reg>;  /* 2.8v */
                 DVDD-supply = <&vgen2_reg>;  /* 1.5v*/
-                pwn-gpios = <&gpio3 26 1>;
-                rst-gpios = <&gpio3 25 0>;
+                pwn-gpios = <&gpio3 28 1>;
+                rst-gpios = <&gpio3 27 0>;
                 csi_id = <0>;
                 mclk = <24000000>;
                 mclk_source = <0>;
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index fc9397df3661..bd84c6d6c20f 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -1161,8 +1161,8 @@
                                 MX6SX_PAD_LCD1_DATA10__CSI1_DATA_7      0x110b0
                                 MX6SX_PAD_LCD1_DATA09__CSI1_DATA_8      0x110b0
                                 MX6SX_PAD_LCD1_DATA08__CSI1_DATA_9      0x110b0
-                                MX6SX_PAD_LCD1_ENABLE__GPIO3_IO_25      0x80000000
-                                MX6SX_PAD_LCD1_HSYNC__GPIO3_IO_26       0x80000000
+                                MX6SX_PAD_LCD1_RESET__GPIO3_IO_27       0x80000000
+                                MX6SX_PAD_LCD1_VSYNC__GPIO3_IO_28       0x80000000
                         >;
                 };