ARM: imx: add HDMI support for SolidRun HummingBoard and Cubox-i

Add the HDMI DT configuration for the SolidRun HummingBoard and Cubox-i.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts
index 121991c6da82d556e10e16bcbae48a6b239a9724..5373a5f2782bedb40786a4701833b162821a1553 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-hummingboard.dts
+++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts
@@ -71,6 +71,13 @@
        status = "okay";
 };
 
+&hdmi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hummingboard_hdmi>;
+       ddc-i2c-bus = <&i2c2>;
+       status = "okay";
+};
+
 &i2c1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hummingboard_i2c1>;
@@ -86,6 +93,13 @@
         */
 };
 
+&i2c2 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hummingboard_i2c2>;
+       status = "okay";
+};
+
 &iomuxc {
        hummingboard {
                pinctrl_hummingboard_flexcan1: hummingboard-flexcan1 {
@@ -101,6 +115,12 @@
                        >;
                };
 
+               pinctrl_hummingboard_hdmi: hummingboard-hdmi {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+                       >;
+               };
+
                pinctrl_hummingboard_i2c1: hummingboard-i2c1 {
                        fsl,pins = <
                                MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
@@ -108,6 +128,13 @@
                        >;
                };
 
+               pinctrl_hummingboard_i2c2: hummingboard-i2c2 {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
+                               MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
+                       >;
+               };
+
                pinctrl_hummingboard_spdif: hummingboard-spdif {
                        fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;
                };

diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index c2a24888a2768969263e1b8536e98ec869b4ff4f..25da82a03110f62eddc0b4b79ec637c0d4ac67d6 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -55,6 +55,20 @@
        };
 };
 
+&hdmi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_cubox_i_hdmi>;
+       ddc-i2c-bus = <&i2c2>;
+       status = "okay";
+};
+
+&i2c2 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_cubox_i_i2c2>;
+       status = "okay";
+};
+
 &i2c3 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_cubox_i_i2c3>;
@@ -69,6 +83,19 @@
 
 &iomuxc {
        cubox_i {
+               pinctrl_cubox_i_hdmi: cubox-i-hdmi {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+                       >;
+               };
+
+               pinctrl_cubox_i_i2c2: cubox-i-i2c2 {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
+                               MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
+                       >;
+               };
+
                pinctrl_cubox_i_i2c3: cubox-i-i2c3 {
                        fsl,pins = <
                                MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1