diff options
| author | Vikas Sajjan <vikas.sajjan@linaro.org> | 2013-02-13 13:46:41 +0530 |
|---|---|---|
| committer | Vikas Sajjan <vikas.sajjan@linaro.org> | 2013-02-18 18:08:05 +0530 |
| commit | cf5632de11def28eefb5440dd6863400b720fd9f (patch) | |
| tree | 293a97296df4b994010e1c5f6cdac41d21bdb022 | |
| parent | a185a8a6ee1f9feca2e74de9062e23209bb6fa98 (diff) | |
Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
| -rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 13 | ||||
| -rw-r--r-- | drivers/video/display/display-core.c | 2 | ||||
| -rw-r--r-- | drivers/video/exynos/Makefile | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index fdfe8c6c561..9bb6195ec98 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c @@ -184,6 +184,7 @@ int exynos_dsim_init_d_phy(struct platform_device *pdev, bool enable) * DPHY and aster block must be enabled at the system initialization * step before data access from/to DPHY begins. */ + exynos_dsim_enable_d_phy(pdev, enable); exynos_dsim_enable_dsi_master(pdev, enable); @@ -324,11 +325,9 @@ static struct lcd_platform_data s6e8ax0_lcd_platform_data = { .power_off_delay = 200, /* 200ms */ }; -static struct mipi_dsim_lcd_device s6e8ax0_mipi_dsim_lcd_device = { +static struct platform_device s6e8ax0_lcd_device = { .name = "s6e8ax0", - .id = -1, - .bus_id = 0, - .platform_data = (void *)&s6e8ax0_lcd_platform_data, + .dev.platform_data = (void*)&s6e8ax0_lcd_platform_data, }; #endif @@ -579,8 +578,12 @@ static void __init exynos5_dt_machine_init(void) exynos_mipi_dsi_register_lcd_device(&tc358764_mipi_dsim_lcd_device); #else pr_err("v MIPI:SAB exynos_mipi_dsi_register_lcd_device from exynos5_dt.c file "); - pr_err("v MIPI:SAB register_ldc_device_name: %s", s6e8ax0_mipi_dsim_lcd_device.name); + //pr_err("v MIPI:SAB register_ldc_device_name: %s", s6e8ax0_mipi_dsim_lcd_device.name); +#if 0 exynos_mipi_dsi_register_lcd_device(&s6e8ax0_mipi_dsim_lcd_device); +#else + platform_device_register(&s6e8ax0_lcd_device); +#endif #endif #endif } diff --git a/drivers/video/display/display-core.c b/drivers/video/display/display-core.c index 5f8be30c560..020a18357f9 100644 --- a/drivers/video/display/display-core.c +++ b/drivers/video/display/display-core.c @@ -15,7 +15,7 @@ #include <linux/list.h> #include <linux/module.h> #include <linux/mutex.h> -#include <linux/videomode.h> +//#include <linux/videomode.h> #include <video/display.h> diff --git a/drivers/video/exynos/Makefile b/drivers/video/exynos/Makefile index ed18636825f..71737dae1dd 100644 --- a/drivers/video/exynos/Makefile +++ b/drivers/video/exynos/Makefile @@ -2,7 +2,7 @@ # Makefile for the exynos video drivers. # obj-$(CONFIG_EXYNOS_LCD_TC358764) += tc358764.o -obj-$(CONFIG_EXYNOS_LCD_S6E8AX0) += s6e8ax0.o obj-$(CONFIG_EXYNOS_MIPI_DSI) += exynos_mipi_dsi.o exynos_mipi_dsi_common.o \ exynos_mipi_dsi_lowlevel.o obj-$(CONFIG_EXYNOS_DP) += exynos_dp_core.o exynos_dp_reg.o +obj-$(CONFIG_EXYNOS_LCD_S6E8AX0) += s6e8ax0.o |