diff options
| -rw-r--r-- | arch/arm/mach-omap2/board-tuna-display.c | 14 | ||||
| -rwxr-xr-x | arch/arm/mach-omap2/board-tuna.c | 3 | ||||
| -rwxr-xr-x | arch/arm/mach-omap2/board-tuna.h | 3 |
3 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-tuna-display.c b/arch/arm/mach-omap2/board-tuna-display.c index d593a53..01f5663 100644 --- a/arch/arm/mach-omap2/board-tuna-display.c +++ b/arch/arm/mach-omap2/board-tuna-display.c @@ -20,6 +20,7 @@ #include <linux/platform_data/panel-s6e8aa0.h> +#include <plat/android-display.h> #include <plat/vram.h> #include <video/omapdss.h> @@ -967,6 +968,10 @@ static struct omap_dss_device tuna_oled_device = { .data4_pol = 0, }, .panel = { + .timings = { + .x_res = 720, + .y_res = 1280, + }, .width_in_um = 58000, .height_in_um = 102000, }, @@ -1066,6 +1071,15 @@ static struct omapfb_platform_data tuna_fb_pdata = { }, }; +void tuna_android_display_setup(struct omap_ion_platform_data *ion) +{ + omap_android_display_setup(&tuna_dss_data, + NULL, + NULL, + &tuna_fb_pdata, + ion); +} + void __init omap4_tuna_display_init(void) { struct panel_s6e8aa0_data *panel; diff --git a/arch/arm/mach-omap2/board-tuna.c b/arch/arm/mach-omap2/board-tuna.c index 9fceb76..8b63e07 100755 --- a/arch/arm/mach-omap2/board-tuna.c +++ b/arch/arm/mach-omap2/board-tuna.c @@ -1380,7 +1380,10 @@ static void __init tuna_reserve(void) #endif #ifdef CONFIG_ION_OMAP + tuna_android_display_setup(get_omap_ion_platform_data()); omap_ion_init(); +#else + tuna_android_display_setup(NULL); #endif omap_reserve(); } diff --git a/arch/arm/mach-omap2/board-tuna.h b/arch/arm/mach-omap2/board-tuna.h index 9d22f36..1da8c6b 100755 --- a/arch/arm/mach-omap2/board-tuna.h +++ b/arch/arm/mach-omap2/board-tuna.h @@ -46,6 +46,9 @@ void omap4_tuna_emif_init(void); void omap4_ehci_init(void); void modem_toro_init(void); +struct omap_ion_platform_data; +void tuna_android_display_setup(struct omap_ion_platform_data *ion); + enum pogo_power_state { POGO_POWER_DISCONNECTED, POGO_POWER_CHARGER, |