ENGR00329278-03 dtsi: imx6sx: sdb: enable lcdif driver

-Enable lcdif driver
-Enable pwm backlight driver.

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

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b4af67913eb0368c18414304d8a2999b78cd1f95..a4eb75dfac7372b95acd9cd57d42157b98bfff55 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -173,6 +173,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
        imx6q-wandboard.dtb \
        imx6sl-evk.dtb \
        imx6sx-sdb.dtb \
+       imx6sx-sdb-lcdif1.dtb \
        vf610-cosmic.dtb \
        vf610-twr.dtb
 dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \

diff --git a/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts b/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts
new file mode 100644 (file)
index 0000000..b066143
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+#include "imx6sx-sdb.dts"
+
+/ {
+       csi1_v4l2_cap {
+               status = "disabled";
+       };
+
+       regulators {
+               reg_lcd_3v3: lcd-3v3 {
+                       status = "okay";
+               };
+       };
+};
+
+&csi1 {
+       status = "disabled";
+};
+
+&lcdif1 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
index 772adcfe798d0949145907bd746eb93c78837a02..ee5077af7c29371f2da4d35f8b95983516c59571 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -22,11 +22,43 @@
                reg = <0x80000000 0x40000000>;
        };
 
+       backlight1 {
+               compatible = "pwm-backlight";
+               pwms = <&pwm3 0 5000000>;
+               brightness-levels = <0 4 8 16 32 64 128 255>;
+               default-brightness-level = <6>;
+               fb-names = "mxs-lcdif0";
+       };
+
+       backlight2 {
+               compatible = "pwm-backlight";
+               pwms = <&pwm4 0 5000000>;
+               brightness-levels = <0 4 8 16 32 64 128 255>;
+               default-brightness-level = <6>;
+               fb-names = "mxs-lcdif1";
+       };
+
+       hannstar_cabc {
+               compatible = "hannstar,cabc";
+
+               lvds0 {
+                       gpios = <&gpio4 26 GPIO_ACTIVE_HIGH>;
+               };
+       };
+
        regulators {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <0>;
 
+               reg_lcd_3v3: lcd-3v3 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "lcd-3v3";
+                       gpio = <&gpio3 27 0>;
+                       enable-active-high;
+                       status = "disabled";
+               };
+
                vcc_sd3: regulator@0 {
                        compatible = "regulator-fixed";
                        reg = <0>;
@@ -41,6 +73,88 @@
        };
 };
 
+&lcdif1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_lcdif_dat
+                    &pinctrl_lcdif_ctrl>;
+       lcd-supply = <&reg_lcd_3v3>;
+       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>;
+                       };
+               };
+       };
+};
+
+&lcdif2 {
+       display = <&display1>;
+       disp-dev = "ldb";
+       status = "okay";
+
+       display1: display {
+               bits-per-pixel = <16>;
+               bus-width = <18>;
+       };
+};
+
+&ldb {
+       status = "okay";
+
+       lvds-channel@0 {
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
+               crtc = "lcdif2";
+               status = "okay";
+
+               display-timings {
+                       native-mode = <&timing1>;
+                       timing1: hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vfront-porch = <7>;
+                               hsync-len = <60>;
+                               vsync-len = <10>;
+                       };
+               };
+       };
+};
+
+&pwm3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm3>;
+       status = "okay";
+};
+
+&pwm4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm4>;
+       status = "okay";
+};
+
 &dcic1 {
        dcic_id = <0>;
        dcic_mux = "dcic-lcdif1";
@@ -150,6 +264,57 @@
                        >;
                };
 
+               pinctrl_lcdif_dat: lcdifdatgrp {
+                       fsl,pins = <
+                               MX6SX_PAD_LCD1_DATA00__LCDIF1_DATA_0 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA01__LCDIF1_DATA_1 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA02__LCDIF1_DATA_2 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA03__LCDIF1_DATA_3 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA04__LCDIF1_DATA_4 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA05__LCDIF1_DATA_5 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA06__LCDIF1_DATA_6 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA07__LCDIF1_DATA_7 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA08__LCDIF1_DATA_8 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA09__LCDIF1_DATA_9 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA10__LCDIF1_DATA_10 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA11__LCDIF1_DATA_11 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA12__LCDIF1_DATA_12 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA13__LCDIF1_DATA_13 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA14__LCDIF1_DATA_14 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA15__LCDIF1_DATA_15 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA16__LCDIF1_DATA_16 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA17__LCDIF1_DATA_17 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA18__LCDIF1_DATA_18 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA19__LCDIF1_DATA_19 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA20__LCDIF1_DATA_20 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA21__LCDIF1_DATA_21 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA22__LCDIF1_DATA_22 0x4001b0b0
+                               MX6SX_PAD_LCD1_DATA23__LCDIF1_DATA_23 0x4001b0b0
+                       >;
+               };
+
+               pinctrl_lcdif_ctrl: lcdifctrlgrp {
+                       fsl,pins = <
+                               MX6SX_PAD_LCD1_CLK__LCDIF1_CLK  0x4001b0b0
+                               MX6SX_PAD_LCD1_ENABLE__LCDIF1_ENABLE 0x4001b0b0
+                               MX6SX_PAD_LCD1_VSYNC__LCDIF1_VSYNC 0x4001b0b0
+                               MX6SX_PAD_LCD1_HSYNC__LCDIF1_HSYNC 0x4001b0b0
+                               MX6SX_PAD_LCD1_RESET__GPIO3_IO_27 0x4001b0b0
+                       >;
+               };
+
+               pinctrl_pwm3: pwm3grp {
+                       fsl,pins = <
+                               MX6SX_PAD_SD1_DATA2__PWM3_OUT 0x110b0
+                       >;
+               };
+
+               pinctrl_pwm4: pwm4grp {
+                       fsl,pins = <
+                               MX6SX_PAD_SD1_DATA1__PWM4_OUT 0x110b0
+                       >;
+               };
+
                pinctrl_qspi2_1: qspi2grp_1 {
                        fsl,pins = <
                                MX6SX_PAD_NAND_WP_B__QSPI2_A_DATA_0     0x70f1

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 45efd2dd28c08952f6a56c1d7efc7040bb76901c..b6ed032422b48386ffe94c40413cd26addfb2c24 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -701,6 +701,32 @@
                                reg = <0x020e4000 0x4000>;
                        };
 
+                       ldb: ldb@020e0014 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "fsl,imx6sx-ldb", "fsl,imx53-ldb";
+                               gpr = <&gpr>;
+                               status = "disabled";
+
+                               clocks = <&clks IMX6SX_CLK_LDB_DI0>,
+                                        <&clks IMX6SX_CLK_LCDIF1_SEL>,
+                                        <&clks IMX6SX_CLK_LCDIF2_SEL>,
+                                        <&clks IMX6SX_CLK_LDB_DI0_DIV_3_5>,
+                                        <&clks IMX6SX_CLK_LDB_DI0_DIV_7>,
+                                        <&clks IMX6SX_CLK_LDB_DI0_DIV_SEL>;
+                               clock-names = "ldb_di0",
+                                             "di0_sel",
+                                             "di1_sel",
+                                             "ldb_di0_div_3_5",
+                                             "ldb_di0_div_7",
+                                             "ldb_di0_div_sel";
+
+                               lvds-channel@0 {
+                                       reg = <0>;
+                                       status = "disabled";
+                               };
+                       };
+
                        sdma: sdma@020ec000 {
                                compatible = "fsl,imx6sx-sdma";
                                reg = <0x020ec000 0x4000>;
@@ -1078,6 +1104,7 @@
                                };
 
                                lcdif1: lcdif@02220000 {
+                                       compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";
                                        reg = <0x02220000 0x4000>;
                                        interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX6SX_CLK_LCDIF1_PIX>,
@@ -1088,6 +1115,7 @@
                                };
 
                                lcdif2: lcdif@02224000 {
+                                       compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";
                                        reg = <0x02224000 0x4000>;
                                        interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX6SX_CLK_LCDIF2_PIX>,