aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/omap_3430sdp_defconfig39
-rw-r--r--drivers/video/omap/Makefile2
-rw-r--r--drivers/video/omap/lcd_2430sdp.c12
3 files changed, 47 insertions, 6 deletions
diff --git a/arch/arm/configs/omap_3430sdp_defconfig b/arch/arm/configs/omap_3430sdp_defconfig
index 9a510eab75a6..8a4a7e2ba87b 100644
--- a/arch/arm/configs/omap_3430sdp_defconfig
+++ b/arch/arm/configs/omap_3430sdp_defconfig
@@ -1313,8 +1313,33 @@ CONFIG_DVB_ISL6421=m
1313# Graphics support 1313# Graphics support
1314# 1314#
1315# CONFIG_VGASTATE is not set 1315# CONFIG_VGASTATE is not set
1316# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1316CONFIG_FB=y
1317# CONFIG_FB is not set 1317# CONFIG_FIRMWARE_EDID is not set
1318# CONFIG_FB_DDC is not set
1319CONFIG_FB_CFB_FILLRECT=y
1320CONFIG_FB_CFB_COPYAREA=y
1321CONFIG_FB_CFB_IMAGEBLIT=y
1322# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
1323# CONFIG_FB_SYS_FILLRECT is not set
1324# CONFIG_FB_SYS_COPYAREA is not set
1325# CONFIG_FB_SYS_IMAGEBLIT is not set
1326# CONFIG_FB_FOREIGN_ENDIAN is not set
1327# CONFIG_FB_SYS_FOPS is not set
1328# CONFIG_FB_SVGALIB is not set
1329# CONFIG_FB_MACMODES is not set
1330# CONFIG_FB_BACKLIGHT is not set
1331# CONFIG_FB_MODE_HELPERS is not set
1332# CONFIG_FB_TILEBLITTING is not set
1333
1334#
1335# Frame buffer hardware drivers
1336#
1337# CONFIG_FB_S1D13XXX is not set
1338# CONFIG_FB_VIRTUAL is not set
1339CONFIG_FB_OMAP=y
1340# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
1341# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
1342CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2
1318# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1343# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1319 1344
1320# 1345#
@@ -1331,6 +1356,16 @@ CONFIG_DISPLAY_SUPPORT=y
1331# 1356#
1332# CONFIG_VGA_CONSOLE is not set 1357# CONFIG_VGA_CONSOLE is not set
1333CONFIG_DUMMY_CONSOLE=y 1358CONFIG_DUMMY_CONSOLE=y
1359CONFIG_FRAMEBUFFER_CONSOLE=y
1360# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
1361# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1362# CONFIG_FONTS is not set
1363CONFIG_FONT_8x8=y
1364CONFIG_FONT_8x16=y
1365CONFIG_LOGO=y
1366CONFIG_LOGO_LINUX_MONO=y
1367CONFIG_LOGO_LINUX_VGA16=y
1368CONFIG_LOGO_LINUX_CLUT224=y
1334CONFIG_SOUND=y 1369CONFIG_SOUND=y
1335CONFIG_SOUND_OSS_CORE=y 1370CONFIG_SOUND_OSS_CORE=y
1336CONFIG_SND=y 1371CONFIG_SND=y
diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile
index c2475e34424c..96d2d4349bda 100644
--- a/drivers/video/omap/Makefile
+++ b/drivers/video/omap/Makefile
@@ -8,6 +8,7 @@ objs-yy := omapfb_main.o
8 8
9objs-y$(CONFIG_ARCH_OMAP1) += lcdc.o 9objs-y$(CONFIG_ARCH_OMAP1) += lcdc.o
10objs-y$(CONFIG_ARCH_OMAP2) += dispc.o 10objs-y$(CONFIG_ARCH_OMAP2) += dispc.o
11objs-y$(CONFIG_ARCH_OMAP3) += dispc.o
11 12
12objs-$(CONFIG_ARCH_OMAP1)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += sossi.o 13objs-$(CONFIG_ARCH_OMAP1)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += sossi.o
13objs-$(CONFIG_ARCH_OMAP2)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += rfbi.o 14objs-$(CONFIG_ARCH_OMAP2)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += rfbi.o
@@ -27,6 +28,7 @@ objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o
27 28
28objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o 29objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o
29objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o 30objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o
31objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o
30objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o 32objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o
31objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o 33objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o
32 34
diff --git a/drivers/video/omap/lcd_2430sdp.c b/drivers/video/omap/lcd_2430sdp.c
index 284cfcec55d9..393712b6f369 100644
--- a/drivers/video/omap/lcd_2430sdp.c
+++ b/drivers/video/omap/lcd_2430sdp.c
@@ -39,13 +39,17 @@
39static unsigned backlight_gpio; 39static unsigned backlight_gpio;
40static unsigned enable_gpio; 40static unsigned enable_gpio;
41 41
42#define LCD_PANEL_BACKLIGHT_GPIO 91
43#define LCD_PANEL_ENABLE_GPIO 154
44#define LCD_PIXCLOCK_MAX 5400 /* freq 5.4 MHz */ 42#define LCD_PIXCLOCK_MAX 5400 /* freq 5.4 MHz */
45#define PM_RECEIVER TWL4030_MODULE_PM_RECEIVER 43#define PM_RECEIVER TWL4030_MODULE_PM_RECEIVER
46#define ENABLE_VAUX2_DEDICATED 0x09 44#define ENABLE_VAUX2_DEDICATED 0x09
47#define ENABLE_VAUX2_DEV_GRP 0x20 45#define ENABLE_VAUX2_DEV_GRP 0x20
46#define ENABLE_VAUX3_DEDICATED 0x03
47#define ENABLE_VAUX3_DEV_GRP 0x20
48 48
49#define ENABLE_VPLL2_DEDICATED 0x05
50#define ENABLE_VPLL2_DEV_GRP 0xE0
51#define TWL4030_VPLL2_DEV_GRP 0x33
52#define TWL4030_VPLL2_DEDICATED 0x36
49 53
50#define t2_out(c, r, v) twl4030_i2c_write_u8(c, r, v) 54#define t2_out(c, r, v) twl4030_i2c_write_u8(c, r, v)
51 55
@@ -146,7 +150,7 @@ struct lcd_panel sdp2430_panel = {
146 150
147 .init = sdp2430_panel_init, 151 .init = sdp2430_panel_init,
148 .cleanup = sdp2430_panel_cleanup, 152 .cleanup = sdp2430_panel_cleanup,
149 .enable = sdp2430_panel_enable, 153 .enable = sdp2430_panel_enable,
150 .disable = sdp2430_panel_disable, 154 .disable = sdp2430_panel_disable,
151 .get_caps = sdp2430_panel_get_caps, 155 .get_caps = sdp2430_panel_get_caps,
152}; 156};
@@ -176,7 +180,7 @@ static int sdp2430_panel_resume(struct platform_device *pdev)
176struct platform_driver sdp2430_panel_driver = { 180struct platform_driver sdp2430_panel_driver = {
177 .probe = sdp2430_panel_probe, 181 .probe = sdp2430_panel_probe,
178 .remove = sdp2430_panel_remove, 182 .remove = sdp2430_panel_remove,
179 .suspend = sdp2430_panel_suspend, 183 .suspend = sdp2430_panel_suspend,
180 .resume = sdp2430_panel_resume, 184 .resume = sdp2430_panel_resume,
181 .driver = { 185 .driver = {
182 .name = "sdp2430_lcd", 186 .name = "sdp2430_lcd",