From: xuhuicong <xhc@rock-chips.com>
Date: Wed, 24 Jul 2013 06:31:42 +0000 (+0800)
Subject: rk3026 hdmi: add hdmi config to 3026/3028a tb deconfig, change platform driver name
X-Git-Tag: firefly_0821_release~6853
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bb7a65609d09e31cd9a5ad32d3e500d1aad56964;p=firefly-linux-kernel-4.4.55.git

rk3026 hdmi: add hdmi config to 3026/3028a tb deconfig, change platform driver name
---

diff --git a/arch/arm/configs/rk3026_tb_defconfig b/arch/arm/configs/rk3026_tb_defconfig
index e1e371370aad..c3390abda034 100644
--- a/arch/arm/configs/rk3026_tb_defconfig
+++ b/arch/arm/configs/rk3026_tb_defconfig
@@ -296,7 +296,6 @@ CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
 CONFIG_ION_ROCKCHIP=y
 CONFIG_FB=y
-CONFIG_FB_MODE_HELPERS=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -306,6 +305,8 @@ CONFIG_FB_ROCKCHIP=y
 CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL=y
 CONFIG_LCD_B101EW05=y
 CONFIG_RK_TRSM=y
+CONFIG_RK_HDMI=y
+CONFIG_HDMI_SOURCE_LCDC1=y
 CONFIG_RGA_RK30=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
@@ -318,6 +319,10 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
+CONFIG_SND_I2S_DMA_EVENT_STATIC=y
+CONFIG_SND_RK_SOC_HDMI_I2S=y
+CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 CONFIG_UHID=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_ACRUX=y
diff --git a/arch/arm/configs/rk3028a_tb_defconfig b/arch/arm/configs/rk3028a_tb_defconfig
index 91616b31c69d..bc1c86659ed7 100644
--- a/arch/arm/configs/rk3028a_tb_defconfig
+++ b/arch/arm/configs/rk3028a_tb_defconfig
@@ -296,7 +296,6 @@ CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
 CONFIG_ION_ROCKCHIP=y
 CONFIG_FB=y
-CONFIG_FB_MODE_HELPERS=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -306,6 +305,8 @@ CONFIG_FB_ROCKCHIP=y
 CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL=y
 CONFIG_LCD_B101EW05=y
 CONFIG_RK_TRSM=y
+CONFIG_RK_HDMI=y
+CONFIG_HDMI_SOURCE_LCDC1=y
 CONFIG_RGA_RK30=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
@@ -318,6 +319,10 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
+CONFIG_SND_I2S_DMA_EVENT_STATIC=y
+CONFIG_SND_RK_SOC_HDMI_I2S=y
+CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 CONFIG_UHID=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_ACRUX=y
diff --git a/arch/arm/mach-rk2928/devices.c b/arch/arm/mach-rk2928/devices.c
index e67452c240d0..009808878a2d 100644
--- a/arch/arm/mach-rk2928/devices.c
+++ b/arch/arm/mach-rk2928/devices.c
@@ -583,7 +583,7 @@ static struct resource resource_hdmi[] = {
 
 static struct platform_device device_hdmi = {
 #ifdef CONFIG_HDMI_RK616
-        .name                           = "rk616-hdmi",
+        .name                           = "rk3026-hdmi",
 #else
 	.name				= "rk2928-hdmi",
 #endif
diff --git a/drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c b/drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
index df3ca6876b9b..82ed9f22437b 100755
--- a/drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
+++ b/drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
@@ -447,7 +447,11 @@ static struct platform_driver rk616_hdmi_driver = {
 	.probe		= rk616_hdmi_probe,
 	.remove		= __devexit_p(rk616_hdmi_remove),
 	.driver		= {
+#ifdef CONFIG_ARCH_RK3026
+		.name	= "rk3026-hdmi",
+#else
 		.name	= "rk616-hdmi",
+#endif
 		.owner	= THIS_MODULE,
 	},
 	.shutdown   = rk616_hdmi_shutdown,