MLK-11606-02: dts: Enable mxc dcic drive

Add dcic driver property to imx6q/dl sabresd/auto
and imx6sx sdb board.

Signed-off-by: Sandor Yu <R01008@freescale.com>

diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index 6e42458..debeab8 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -255,6 +255,18 @@
        assigned-clock-rates = <0>, <0>, <0>, <0>, <24576000>;
 };
 
+&dcic1 {
+       dcic_id = <0>;
+       dcic_mux = "dcic-hdmi";
+       status = "okay";
+};
+
+&dcic2 {
+       dcic_id = <1>;
+       dcic_mux = "dcic-lvds0";
+       status = "okay";
+};
+
 &ecspi1 {
        fsl,spi-num-chipselects = <1>;
        cs-gpios = <&gpio3 19 0>;

diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index 745ea51..938ef6b 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
@@ -548,6 +548,18 @@
        };
 };
 
+&dcic1 {
+       dcic_id = <0>;
+       dcic_mux = "dcic-lcdif1";
+       status = "okay";
+};
+
+&dcic2 {
+       dcic_id = <1>;
+       dcic_mux = "dcic-lvds";
+       status = "okay";
+};
+
 &vadc {
        vadc_in = <0>;
        csi_id = <1>;

diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index d86cb17..39a6a34 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -263,6 +263,18 @@
        };
 };
 
+&dcic1 {
+       dcic_id = <0>;
+       dcic_mux = "dcic-lcdif1";
+       status = "okay";
+};
+
+&dcic2 {
+       dcic_id = <1>;
+       dcic_mux = "dcic-lvds";
+       status = "okay";
+};
+
 &fec2 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet2>;

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 58ad459..45aa73e 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -1237,6 +1237,28 @@
                                        status = "disabled";
                                };
 
+                               dcic1: dcic@0220c000 {
+                                       compatible = "fsl,imx6sx-dcic";
+                                       reg = <0x0220c000 0x4000>;
+                                       interrupts = <0 124 IRQ_TYPE_LEVEL_HIGH>;
+                                       clocks = <&clks IMX6SX_CLK_DCIC1>,
+                                               <&clks IMX6SX_CLK_DISPLAY_AXI>;
+                                       clock-names = "dcic", "disp-axi";
+                                       gpr = <&gpr>;
+                                       status = "disabled";
+                               };
+
+                               dcic2: dcic@02210000 {
+                                       compatible = "fsl,imx6sx-dcic";
+                                       reg = <0x02210000 0x4000>;
+                                       interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
+                                       clocks = <&clks IMX6SX_CLK_DCIC2>,
+                                               <&clks IMX6SX_CLK_DISPLAY_AXI>;
+                                       clock-names = "dcic", "disp-axi";
+                                       gpr = <&gpr>;
+                                       status = "disabled";
+                               };
+
                                pxp: pxp@02218000 {
                                        reg = <0x02218000 0x4000>;
                                        interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index bbc0c89..60f1a11 100644 (file)
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -249,6 +249,7 @@ CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
 CONFIG_FB_MXC_LDB=y
 CONFIG_FB_MXC_HDMI=y
 CONFIG_FB_MXS_SII902X=y
+CONFIG_FB_MXC_DCIC=m
 CONFIG_HANNSTAR_CABC=y
 CONFIG_FB_MXC_EINK_PANEL=y
 CONFIG_FB_MXC_EINK_V2_PANEL=y
@@ -266,10 +267,10 @@ CONFIG_SND_SOC=y
 CONFIG_SND_IMX_SOC=y
 CONFIG_SND_SOC_EUKREA_TLV320=y
 CONFIG_SND_SOC_IMX_WM8960=y
+CONFIG_SND_SOC_IMX_SII902X=y
 CONFIG_SND_SOC_IMX_WM8958=y
 CONFIG_SND_SOC_IMX_CS42888=y
 CONFIG_SND_SOC_IMX_WM8962=y
-CONFIG_SND_SOC_IMX_SII902X=y
 CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_SND_SOC_IMX_MQS=y
 CONFIG_SND_SOC_IMX_SPDIF=y