shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xuhuicong
2013-07-24 14:31:42 +08:00
parent 6647a29683
commit bb7a65609d
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/configs/rk3026_tb_defconfig
View File

@@ -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

7
arch/arm/configs/rk3028a_tb_defconfig
View File

@@ -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

2
arch/arm/mach-rk2928/devices.c
View File

@@ -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

4
drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
View File

@@ -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,