diff options
author | Imre Deak <imre.deak@nokia.com> | 2009-05-28 17:04:00 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 17:04:00 -0400 |
commit | 49adf465d2448dc15866b2267df46ea2e1ccacf1 (patch) | |
tree | ff94da241cf3e7dc903a7b78628b1eb61146418d /arch/arm/mach-omap2/board-ldp.c | |
parent | 17a722caaef16835ab83f39046da1760cda8a578 (diff) |
ARM: OMAP3: ZOOM MDK: Add FB support to board file
Based on an earlier patch by Stanley.Miao <stanley.miao@windriver.com>
with board-*.c changes split to avoid conflicts with other device updates.
Cc: linux-fbdev-devel@lists.sourceforge.net
Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
Signed-off-by: Imre Deak <imre.deak@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index da57b0fcda14..59ac8ed979ea 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
@@ -77,10 +77,6 @@ static struct platform_device ldp_smsc911x_device = { | |||
77 | }, | 77 | }, |
78 | }; | 78 | }; |
79 | 79 | ||
80 | static struct platform_device *ldp_devices[] __initdata = { | ||
81 | &ldp_smsc911x_device, | ||
82 | }; | ||
83 | |||
84 | static inline void __init ldp_init_smsc911x(void) | 80 | static inline void __init ldp_init_smsc911x(void) |
85 | { | 81 | { |
86 | int eth_cs; | 82 | int eth_cs; |
@@ -122,8 +118,18 @@ static struct omap_uart_config ldp_uart_config __initdata = { | |||
122 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | 118 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), |
123 | }; | 119 | }; |
124 | 120 | ||
121 | static struct platform_device ldp_lcd_device = { | ||
122 | .name = "ldp_lcd", | ||
123 | .id = -1, | ||
124 | }; | ||
125 | |||
126 | static struct omap_lcd_config ldp_lcd_config __initdata = { | ||
127 | .ctrl_name = "internal", | ||
128 | }; | ||
129 | |||
125 | static struct omap_board_config_kernel ldp_config[] __initdata = { | 130 | static struct omap_board_config_kernel ldp_config[] __initdata = { |
126 | { OMAP_TAG_UART, &ldp_uart_config }, | 131 | { OMAP_TAG_UART, &ldp_uart_config }, |
132 | { OMAP_TAG_LCD, &ldp_lcd_config }, | ||
127 | }; | 133 | }; |
128 | 134 | ||
129 | static struct twl4030_gpio_platform_data ldp_gpio_data = { | 135 | static struct twl4030_gpio_platform_data ldp_gpio_data = { |
@@ -168,6 +174,11 @@ static struct twl4030_hsmmc_info mmc[] __initdata = { | |||
168 | {} /* Terminator */ | 174 | {} /* Terminator */ |
169 | }; | 175 | }; |
170 | 176 | ||
177 | static struct platform_device *ldp_devices[] __initdata = { | ||
178 | &ldp_smsc911x_device, | ||
179 | &ldp_lcd_device, | ||
180 | }; | ||
181 | |||
171 | static void __init omap_ldp_init(void) | 182 | static void __init omap_ldp_init(void) |
172 | { | 183 | { |
173 | omap_i2c_init(); | 184 | omap_i2c_init(); |