HDMI: add dt node at rk3288.dtsi and add HDMI config

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index e9435f4b57ff464ba8a7c6909825638056a25318..f581ccf5996a7a9ca7b3d5dacc7f78f698fbe854 100755 (executable)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -192,7 +192,19 @@
                 reg = <0xff970000 0x4000>;
                 interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
                 status = "disabled";
-        }
+        };
+
+       hdmi:hdmi@ff980000 {
+               compatible = "rockchip,rk3288-hdmi";
+               reg = <0xff980000 0x20000>;
+               interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+               rockchip,hdmi_lcdc_source = <1>;
+               pinctrl-names = "default", "gpio";
+               pinctrl-0 = <&i2c5_sda &i2c5_scl>;
+               pinctrl-1 = <&i2c5_gpio>;
+               status = "disabled";
+         };
+
     adc: adc@ff100000 {
         compatible = "rockchip,saradc";
         reg = <0xff100000 0x100>;
@@ -279,7 +291,7 @@
        
        sdio0: mshc@ff0d0000 {
                compatible = "rockchip,rk_mmc";
-           reg = <ff0d0000 0x4000>;
+           reg = <0xff0d0000 0x4000>;
            interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; /*irq=65*/
            #address-cells = <1>;
            #size-cells = <0>;
@@ -298,7 +310,7 @@
        
        sdio1: mshc@ff0e0000 {
                compatible = "rockchip,rk_mmc";
-           reg = <ff0e0000 0x4000>;
+           reg = <0xff0e0000 0x4000>;
            interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; /*irq=66*/
            #address-cells = <1>;
            #size-cells = <0>;
@@ -317,7 +329,7 @@
        
        emmc: mshc@ff0f0000 {
                compatible = "rockchip,rk_mmc";
-           reg = <ff0f0000 0x4000>;
+           reg = <0xff0f0000 0x4000>;
            interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; /*irq=67*/
            #address-cells = <1>;
            #size-cells = <0>;

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 4396673772692946ed4eecc0d58795f99a51c759..a24aef1992d1b81dacae9e8023755b0d45f0a2c2 100755 (executable)
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -328,6 +328,7 @@ CONFIG_FB_ROCKCHIP=y
 CONFIG_LCDC_RK3188=y
 CONFIG_LCDC0_RK3188=y
 CONFIG_LCDC1_RK3188=y
+CONFIG_RK_HDMI=y
 CONFIG_RK_TRSM=y
 CONFIG_DP_ANX6345=y
 CONFIG_RK32_DP=y

diff --git a/drivers/video/rockchip/hdmi/Kconfig b/drivers/video/rockchip/hdmi/Kconfig
index 144b9a51981f36ae6a9524c5e5220b88ab68dac5..b32cf6c0b23a1451782a69fc0d6429074201625e 100755 (executable)
--- a/drivers/video/rockchip/hdmi/Kconfig
+++ b/drivers/video/rockchip/hdmi/Kconfig
@@ -1,5 +1,6 @@
 menuconfig RK_HDMI
        bool "Rockchip HDMI support"
+       depends on FB_ROCKCHIP
        select FB_MODE_HELPERS
        
 if RK_HDMI

diff --git a/drivers/video/rockchip/hdmi/chips/Makefile b/drivers/video/rockchip/hdmi/chips/Makefile
index 6a6c2340976023064f915c947f12451f1f98a03e..0f2e4a1f146d5f9253cefa05e00fae44884ecc25 100755 (executable)
--- a/drivers/video/rockchip/hdmi/chips/Makefile
+++ b/drivers/video/rockchip/hdmi/chips/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_HDMI_RK2928) += rk2928/
 obj-$(CONFIG_HDMI_RK610) += rk610/
 obj-$(CONFIG_HDMI_CAT66121) += cat66121/
 obj-$(CONFIG_HDMI_RK616) += rk616/
+obj-y += rk3288/

diff --git a/drivers/video/rockchip/hdmi/chips/rk3288/Makefile b/drivers/video/rockchip/hdmi/chips/rk3288/Makefile
index f2855eed64bbf503f70488f9986e4b8b9b2be47a..d93b6f036c2299ab5fc5ab801edcd34ce9b65928 100644 (file)
--- a/drivers/video/rockchip/hdmi/chips/rk3288/Makefile
+++ b/drivers/video/rockchip/hdmi/chips/rk3288/Makefile
@@ -4,5 +4,5 @@
 
 ccflags-$(CONFIG_RK_HDMI_DEBUG) = -DDEBUG -DHDMI_DEBUG
 
-obj-$(CONFIG_HDMI_RK3288) += rk3288_hdmi_hw.o rk3288_hdmi.o
+obj-y += rk3288_hdmi_hw.o rk3288_hdmi.o
 obj-$(CONFIG_HDCP_RK3288) += hdcp/