diff options
author | Tony Lindgren <tony@atomide.com> | 2008-12-10 20:37:16 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-12-10 20:37:16 -0500 |
commit | 652bcd8f72cc0cdf4499ce7d73990514e5e3e4b9 (patch) | |
tree | 58d67895f5dc621c529742b62152bbb8d6bbb5ce /arch/arm/mach-omap2 | |
parent | 2619bc327417f549f1c89d5ef9b4a4aa768f41a2 (diff) |
omap mmc: Remove broken MMC init code
Most of the omap1 MMC boards got broken by an earlier patch
138ab9f8321f67c71984ca43222efa71b0a0a0a9. If you look closely,
the MMC init funtions are pretty much just stubs.
Remove broken init code to make room for cleaner MMC init code.
Cc: Pierre Ossman <drzeus-mmc@drzeus.cx>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 11 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 11 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 11 |
3 files changed, 0 insertions, 33 deletions
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index d83035b436d5..bf1e5d32c2a3 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
@@ -261,16 +261,6 @@ static struct omap_uart_config apollon_uart_config __initdata = { | |||
261 | .enabled_uarts = (1 << 0) | (0 << 1) | (0 << 2), | 261 | .enabled_uarts = (1 << 0) | (0 << 1) | (0 << 2), |
262 | }; | 262 | }; |
263 | 263 | ||
264 | static struct omap_mmc_config apollon_mmc_config __initdata = { | ||
265 | .mmc [0] = { | ||
266 | .enabled = 1, | ||
267 | .wire4 = 1, | ||
268 | .wp_pin = -1, | ||
269 | .power_pin = -1, | ||
270 | .switch_pin = -1, | ||
271 | }, | ||
272 | }; | ||
273 | |||
274 | static struct omap_usb_config apollon_usb_config __initdata = { | 264 | static struct omap_usb_config apollon_usb_config __initdata = { |
275 | .register_dev = 1, | 265 | .register_dev = 1, |
276 | .hmc_mode = 0x14, /* 0:dev 1:host1 2:disable */ | 266 | .hmc_mode = 0x14, /* 0:dev 1:host1 2:disable */ |
@@ -284,7 +274,6 @@ static struct omap_lcd_config apollon_lcd_config __initdata = { | |||
284 | 274 | ||
285 | static struct omap_board_config_kernel apollon_config[] = { | 275 | static struct omap_board_config_kernel apollon_config[] = { |
286 | { OMAP_TAG_UART, &apollon_uart_config }, | 276 | { OMAP_TAG_UART, &apollon_uart_config }, |
287 | { OMAP_TAG_MMC, &apollon_mmc_config }, | ||
288 | { OMAP_TAG_USB, &apollon_usb_config }, | 277 | { OMAP_TAG_USB, &apollon_usb_config }, |
289 | { OMAP_TAG_LCD, &apollon_lcd_config }, | 278 | { OMAP_TAG_LCD, &apollon_lcd_config }, |
290 | }; | 279 | }; |
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 9ba097868e72..3b34c20d1df4 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
@@ -41,19 +41,8 @@ static struct omap_uart_config generic_uart_config __initdata = { | |||
41 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | 41 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), |
42 | }; | 42 | }; |
43 | 43 | ||
44 | static struct omap_mmc_config generic_mmc_config __initdata = { | ||
45 | .mmc [0] = { | ||
46 | .enabled = 0, | ||
47 | .wire4 = 0, | ||
48 | .wp_pin = -1, | ||
49 | .power_pin = -1, | ||
50 | .switch_pin = -1, | ||
51 | }, | ||
52 | }; | ||
53 | |||
54 | static struct omap_board_config_kernel generic_config[] = { | 44 | static struct omap_board_config_kernel generic_config[] = { |
55 | { OMAP_TAG_UART, &generic_uart_config }, | 45 | { OMAP_TAG_UART, &generic_uart_config }, |
56 | { OMAP_TAG_MMC, &generic_mmc_config }, | ||
57 | }; | 46 | }; |
58 | 47 | ||
59 | static void __init omap_generic_init(void) | 48 | static void __init omap_generic_init(void) |
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 7de0506e1e29..5e9b14675b1e 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
@@ -373,23 +373,12 @@ static struct omap_uart_config h4_uart_config __initdata = { | |||
373 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | 373 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), |
374 | }; | 374 | }; |
375 | 375 | ||
376 | static struct omap_mmc_config h4_mmc_config __initdata = { | ||
377 | .mmc [0] = { | ||
378 | .enabled = 1, | ||
379 | .wire4 = 1, | ||
380 | .wp_pin = -1, | ||
381 | .power_pin = -1, | ||
382 | .switch_pin = -1, | ||
383 | }, | ||
384 | }; | ||
385 | |||
386 | static struct omap_lcd_config h4_lcd_config __initdata = { | 376 | static struct omap_lcd_config h4_lcd_config __initdata = { |
387 | .ctrl_name = "internal", | 377 | .ctrl_name = "internal", |
388 | }; | 378 | }; |
389 | 379 | ||
390 | static struct omap_board_config_kernel h4_config[] = { | 380 | static struct omap_board_config_kernel h4_config[] = { |
391 | { OMAP_TAG_UART, &h4_uart_config }, | 381 | { OMAP_TAG_UART, &h4_uart_config }, |
392 | { OMAP_TAG_MMC, &h4_mmc_config }, | ||
393 | { OMAP_TAG_LCD, &h4_lcd_config }, | 382 | { OMAP_TAG_LCD, &h4_lcd_config }, |
394 | }; | 383 | }; |
395 | 384 | ||