diff options
| author | Dan Murphy <dmurphy@ti.com> | 2011-10-11 14:14:24 -0500 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2011-10-11 14:14:24 -0500 |
| commit | 465cc1860ed725aa2a70263d6887ad7d76f86e34 (patch) | |
| tree | 9d6d841dac0f8242a545c63afda83c57ed15550f | |
| parent | ee03a50337f3f36e1648ab0e5ec3b25b1f344104 (diff) | |
| download | kernel_samsung_espresso10-465cc1860ed725aa2a70263d6887ad7d76f86e34.zip kernel_samsung_espresso10-465cc1860ed725aa2a70263d6887ad7d76f86e34.tar.gz kernel_samsung_espresso10-465cc1860ed725aa2a70263d6887ad7d76f86e34.tar.bz2 | |
ARM: Panda: Remove dependency of vram command line argument
Set vram size as part of board init code.
No longer a reliance on a boot arg for vram configuration
Change-Id: Iad2a2fae1e4def1c171fe93cbc00a0785c74f01e
Signed-off-by: Dan Murphy <dmurphy@ti.com>
| -rw-r--r-- | arch/arm/configs/panda_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/configs/panda_defconfig b/arch/arm/configs/panda_defconfig index 630013c..720a301 100644 --- a/arch/arm/configs/panda_defconfig +++ b/arch/arm/configs/panda_defconfig @@ -32,7 +32,7 @@ CONFIG_SMP=y # CONFIG_SMP_ON_UP is not set CONFIG_NR_CPUS=2 CONFIG_PREEMPT=y -CONFIG_CMDLINE="console=ttyO2,115200n8 mem=1G androidboot.console=ttyO2 vram=20M omapfb.vram=0:16M" +CONFIG_CMDLINE="console=ttyO2,115200n8 mem=1G androidboot.console=ttyO2" CONFIG_CMDLINE_EXTEND=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index bb56ac9..49f6ca3 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -23,6 +23,7 @@ #include <linux/io.h> #include <linux/leds.h> #include <linux/gpio.h> +#include <linux/omapfb.h> #include <linux/usb/otg.h> #include <linux/i2c/twl.h> #include <linux/regulator/machine.h> @@ -47,6 +48,7 @@ #include <plat/mmc.h> #include <plat/omap_apps_brd_id.h> #include <plat/remoteproc.h> +#include <plat/vram.h> #include <video/omap-panel-generic-dpi.h> #include "timer-gp.h" @@ -684,6 +686,18 @@ void omap4_panda_display_init(void) omap_display_init(&omap4_panda_dss_data); } +#define PANDA_FB_RAM_SIZE SZ_16M /* 1920×1080*4 * 2 */ +static struct omapfb_platform_data panda_fb_pdata = { + .mem_desc = { + .region_cnt = 1, + .region = { + [0] = { + .size = PANDA_FB_RAM_SIZE, + }, + }, + }, +}; + extern void __init omap4_panda_android_init(void); static void __init omap4_panda_init(void) @@ -720,6 +734,8 @@ static void __init omap4_panda_init(void) usb_musb_init(&musb_board_data); omap_dmm_init(); + omap_vram_set_sdram_vram(PANDA_FB_RAM_SIZE, 0); + omapfb_set_platform_data(&panda_fb_pdata); omap4_panda_display_init(); if (cpu_is_omap446x()) { |