diff options
-rw-r--r-- | arch/arm/mach-omap1/board-h2-mmc.c | 86 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-h3-mmc.c | 90 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-h3.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-palmte.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-palmz71.c | 11 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-sx1-mmc.c | 49 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-sx1.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-voiceblue.c | 10 | ||||
-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 |
12 files changed, 1 insertions, 309 deletions
diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c index ab9ee5820c48..504ae881360f 100644 --- a/arch/arm/mach-omap1/board-h2-mmc.c +++ b/arch/arm/mach-omap1/board-h2-mmc.c | |||
@@ -15,91 +15,6 @@ | |||
15 | #include <mach/mmc.h> | 15 | #include <mach/mmc.h> |
16 | #include <mach/gpio.h> | 16 | #include <mach/gpio.h> |
17 | 17 | ||
18 | #ifdef CONFIG_MMC_OMAP | ||
19 | static int slot_cover_open; | ||
20 | static struct device *mmc_device; | ||
21 | |||
22 | static int h2_mmc_set_power(struct device *dev, int slot, int power_on, | ||
23 | int vdd) | ||
24 | { | ||
25 | #ifdef CONFIG_MMC_DEBUG | ||
26 | dev_dbg(dev, "Set slot %d power: %s (vdd %d)\n", slot + 1, | ||
27 | power_on ? "on" : "off", vdd); | ||
28 | #endif | ||
29 | if (slot != 0) { | ||
30 | dev_err(dev, "No such slot %d\n", slot + 1); | ||
31 | return -ENODEV; | ||
32 | } | ||
33 | |||
34 | return 0; | ||
35 | } | ||
36 | |||
37 | static int h2_mmc_set_bus_mode(struct device *dev, int slot, int bus_mode) | ||
38 | { | ||
39 | #ifdef CONFIG_MMC_DEBUG | ||
40 | dev_dbg(dev, "Set slot %d bus_mode %s\n", slot + 1, | ||
41 | bus_mode == MMC_BUSMODE_OPENDRAIN ? "open-drain" : "push-pull"); | ||
42 | #endif | ||
43 | if (slot != 0) { | ||
44 | dev_err(dev, "No such slot %d\n", slot + 1); | ||
45 | return -ENODEV; | ||
46 | } | ||
47 | |||
48 | return 0; | ||
49 | } | ||
50 | |||
51 | static int h2_mmc_get_cover_state(struct device *dev, int slot) | ||
52 | { | ||
53 | BUG_ON(slot != 0); | ||
54 | |||
55 | return slot_cover_open; | ||
56 | } | ||
57 | |||
58 | void h2_mmc_slot_cover_handler(void *arg, int state) | ||
59 | { | ||
60 | if (mmc_device == NULL) | ||
61 | return; | ||
62 | |||
63 | slot_cover_open = state; | ||
64 | omap_mmc_notify_cover_event(mmc_device, 0, state); | ||
65 | } | ||
66 | |||
67 | static int h2_mmc_late_init(struct device *dev) | ||
68 | { | ||
69 | int ret = 0; | ||
70 | |||
71 | mmc_device = dev; | ||
72 | |||
73 | return ret; | ||
74 | } | ||
75 | |||
76 | static void h2_mmc_cleanup(struct device *dev) | ||
77 | { | ||
78 | } | ||
79 | |||
80 | static struct omap_mmc_platform_data h2_mmc_data = { | ||
81 | .nr_slots = 1, | ||
82 | .switch_slot = NULL, | ||
83 | .init = h2_mmc_late_init, | ||
84 | .cleanup = h2_mmc_cleanup, | ||
85 | .slots[0] = { | ||
86 | .set_power = h2_mmc_set_power, | ||
87 | .set_bus_mode = h2_mmc_set_bus_mode, | ||
88 | .get_ro = NULL, | ||
89 | .get_cover_state = h2_mmc_get_cover_state, | ||
90 | .ocr_mask = MMC_VDD_28_29 | MMC_VDD_30_31 | | ||
91 | MMC_VDD_32_33 | MMC_VDD_33_34, | ||
92 | .name = "mmcblk", | ||
93 | }, | ||
94 | }; | ||
95 | |||
96 | void __init h2_mmc_init(void) | ||
97 | { | ||
98 | omap_set_mmc_info(1, &h2_mmc_data); | ||
99 | } | ||
100 | |||
101 | #else | ||
102 | |||
103 | void __init h2_mmc_init(void) | 18 | void __init h2_mmc_init(void) |
104 | { | 19 | { |
105 | } | 20 | } |
@@ -107,4 +22,3 @@ void __init h2_mmc_init(void) | |||
107 | void h2_mmc_slot_cover_handler(void *arg, int state) | 22 | void h2_mmc_slot_cover_handler(void *arg, int state) |
108 | { | 23 | { |
109 | } | 24 | } |
110 | #endif | ||
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index c5b4a3b718cf..125d8e21dcea 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -378,15 +378,6 @@ static struct omap_usb_config h2_usb_config __initdata = { | |||
378 | .pins[1] = 3, | 378 | .pins[1] = 3, |
379 | }; | 379 | }; |
380 | 380 | ||
381 | static struct omap_mmc_config h2_mmc_config __initdata = { | ||
382 | .mmc[0] = { | ||
383 | .enabled = 1, | ||
384 | .wire4 = 1, | ||
385 | }, | ||
386 | }; | ||
387 | |||
388 | extern struct omap_mmc_platform_data h2_mmc_data; | ||
389 | |||
390 | static struct omap_uart_config h2_uart_config __initdata = { | 381 | static struct omap_uart_config h2_uart_config __initdata = { |
391 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | 382 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), |
392 | }; | 383 | }; |
@@ -397,7 +388,6 @@ static struct omap_lcd_config h2_lcd_config __initdata = { | |||
397 | 388 | ||
398 | static struct omap_board_config_kernel h2_config[] __initdata = { | 389 | static struct omap_board_config_kernel h2_config[] __initdata = { |
399 | { OMAP_TAG_USB, &h2_usb_config }, | 390 | { OMAP_TAG_USB, &h2_usb_config }, |
400 | { OMAP_TAG_MMC, &h2_mmc_config }, | ||
401 | { OMAP_TAG_UART, &h2_uart_config }, | 391 | { OMAP_TAG_UART, &h2_uart_config }, |
402 | { OMAP_TAG_LCD, &h2_lcd_config }, | 392 | { OMAP_TAG_LCD, &h2_lcd_config }, |
403 | }; | 393 | }; |
diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c index 36085819098c..0baba1c4d12d 100644 --- a/arch/arm/mach-omap1/board-h3-mmc.c +++ b/arch/arm/mach-omap1/board-h3-mmc.c | |||
@@ -15,95 +15,6 @@ | |||
15 | #include <mach/mmc.h> | 15 | #include <mach/mmc.h> |
16 | #include <mach/gpio.h> | 16 | #include <mach/gpio.h> |
17 | 17 | ||
18 | #ifdef CONFIG_MMC_OMAP | ||
19 | static int slot_cover_open; | ||
20 | static struct device *mmc_device; | ||
21 | |||
22 | static int h3_mmc_set_power(struct device *dev, int slot, int power_on, | ||
23 | int vdd) | ||
24 | { | ||
25 | #ifdef CONFIG_MMC_DEBUG | ||
26 | dev_dbg(dev, "Set slot %d power: %s (vdd %d)\n", slot + 1, | ||
27 | power_on ? "on" : "off", vdd); | ||
28 | #endif | ||
29 | if (slot != 0) { | ||
30 | dev_err(dev, "No such slot %d\n", slot + 1); | ||
31 | return -ENODEV; | ||
32 | } | ||
33 | |||
34 | return 0; | ||
35 | } | ||
36 | |||
37 | static int h3_mmc_set_bus_mode(struct device *dev, int slot, int bus_mode) | ||
38 | { | ||
39 | int ret = 0; | ||
40 | |||
41 | #ifdef CONFIG_MMC_DEBUG | ||
42 | dev_dbg(dev, "Set slot %d bus_mode %s\n", slot + 1, | ||
43 | bus_mode == MMC_BUSMODE_OPENDRAIN ? "open-drain" : "push-pull"); | ||
44 | #endif | ||
45 | if (slot != 0) { | ||
46 | dev_err(dev, "No such slot %d\n", slot + 1); | ||
47 | return -ENODEV; | ||
48 | } | ||
49 | |||
50 | /* Treated on upper level */ | ||
51 | |||
52 | return bus_mode; | ||
53 | } | ||
54 | |||
55 | static int h3_mmc_get_cover_state(struct device *dev, int slot) | ||
56 | { | ||
57 | BUG_ON(slot != 0); | ||
58 | |||
59 | return slot_cover_open; | ||
60 | } | ||
61 | |||
62 | void h3_mmc_slot_cover_handler(void *arg, int state) | ||
63 | { | ||
64 | if (mmc_device == NULL) | ||
65 | return; | ||
66 | |||
67 | slot_cover_open = state; | ||
68 | omap_mmc_notify_cover_event(mmc_device, 0, state); | ||
69 | } | ||
70 | |||
71 | static int h3_mmc_late_init(struct device *dev) | ||
72 | { | ||
73 | int ret = 0; | ||
74 | |||
75 | mmc_device = dev; | ||
76 | |||
77 | return ret; | ||
78 | } | ||
79 | |||
80 | static void h3_mmc_cleanup(struct device *dev) | ||
81 | { | ||
82 | } | ||
83 | |||
84 | static struct omap_mmc_platform_data h3_mmc_data = { | ||
85 | .nr_slots = 1, | ||
86 | .switch_slot = NULL, | ||
87 | .init = h3_mmc_late_init, | ||
88 | .cleanup = h3_mmc_cleanup, | ||
89 | .slots[0] = { | ||
90 | .set_power = h3_mmc_set_power, | ||
91 | .set_bus_mode = h3_mmc_set_bus_mode, | ||
92 | .get_ro = NULL, | ||
93 | .get_cover_state = h3_mmc_get_cover_state, | ||
94 | .ocr_mask = MMC_VDD_28_29 | MMC_VDD_30_31 | | ||
95 | MMC_VDD_32_33 | MMC_VDD_33_34, | ||
96 | .name = "mmcblk", | ||
97 | }, | ||
98 | }; | ||
99 | |||
100 | void __init h3_mmc_init(void) | ||
101 | { | ||
102 | omap_set_mmc_info(1, &h3_mmc_data); | ||
103 | } | ||
104 | |||
105 | #else | ||
106 | |||
107 | void __init h3_mmc_init(void) | 18 | void __init h3_mmc_init(void) |
108 | { | 19 | { |
109 | } | 20 | } |
@@ -111,4 +22,3 @@ void __init h3_mmc_init(void) | |||
111 | void h3_mmc_slot_cover_handler(void *arg, int state) | 22 | void h3_mmc_slot_cover_handler(void *arg, int state) |
112 | { | 23 | { |
113 | } | 24 | } |
114 | #endif | ||
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 0332203bd53d..5157eea9be35 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c | |||
@@ -447,15 +447,6 @@ static struct omap_usb_config h3_usb_config __initdata = { | |||
447 | .pins[1] = 3, | 447 | .pins[1] = 3, |
448 | }; | 448 | }; |
449 | 449 | ||
450 | static struct omap_mmc_config h3_mmc_config __initdata = { | ||
451 | .mmc[0] = { | ||
452 | .enabled = 1, | ||
453 | .wire4 = 1, | ||
454 | }, | ||
455 | }; | ||
456 | |||
457 | extern struct omap_mmc_platform_data h3_mmc_data; | ||
458 | |||
459 | static struct omap_uart_config h3_uart_config __initdata = { | 450 | static struct omap_uart_config h3_uart_config __initdata = { |
460 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | 451 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), |
461 | }; | 452 | }; |
@@ -466,7 +457,6 @@ static struct omap_lcd_config h3_lcd_config __initdata = { | |||
466 | 457 | ||
467 | static struct omap_board_config_kernel h3_config[] __initdata = { | 458 | static struct omap_board_config_kernel h3_config[] __initdata = { |
468 | { OMAP_TAG_USB, &h3_usb_config }, | 459 | { OMAP_TAG_USB, &h3_usb_config }, |
469 | { OMAP_TAG_MMC, &h3_mmc_config }, | ||
470 | { OMAP_TAG_UART, &h3_uart_config }, | 460 | { OMAP_TAG_UART, &h3_uart_config }, |
471 | { OMAP_TAG_LCD, &h3_lcd_config }, | 461 | { OMAP_TAG_LCD, &h3_lcd_config }, |
472 | }; | 462 | }; |
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 4141e3917d7c..75e32d35afd9 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -316,7 +316,6 @@ static void palmte_get_power_status(struct apm_power_info *info, int *battery) | |||
316 | 316 | ||
317 | static struct omap_board_config_kernel palmte_config[] __initdata = { | 317 | static struct omap_board_config_kernel palmte_config[] __initdata = { |
318 | { OMAP_TAG_USB, &palmte_usb_config }, | 318 | { OMAP_TAG_USB, &palmte_usb_config }, |
319 | { OMAP_TAG_MMC, &palmte_mmc_config }, | ||
320 | { OMAP_TAG_LCD, &palmte_lcd_config }, | 319 | { OMAP_TAG_LCD, &palmte_lcd_config }, |
321 | { OMAP_TAG_UART, &palmte_uart_config }, | 320 | { OMAP_TAG_UART, &palmte_uart_config }, |
322 | }; | 321 | }; |
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index 801fb5f62ed7..cc05257eb1cd 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c | |||
@@ -267,16 +267,6 @@ static struct omap_usb_config palmz71_usb_config __initdata = { | |||
267 | .pins[0] = 2, | 267 | .pins[0] = 2, |
268 | }; | 268 | }; |
269 | 269 | ||
270 | static struct omap_mmc_config palmz71_mmc_config __initdata = { | ||
271 | .mmc[0] = { | ||
272 | .enabled = 1, | ||
273 | .wire4 = 0, | ||
274 | .wp_pin = PALMZ71_MMC_WP_GPIO, | ||
275 | .power_pin = -1, | ||
276 | .switch_pin = PALMZ71_MMC_IN_GPIO, | ||
277 | }, | ||
278 | }; | ||
279 | |||
280 | static struct omap_lcd_config palmz71_lcd_config __initdata = { | 270 | static struct omap_lcd_config palmz71_lcd_config __initdata = { |
281 | .ctrl_name = "internal", | 271 | .ctrl_name = "internal", |
282 | }; | 272 | }; |
@@ -287,7 +277,6 @@ static struct omap_uart_config palmz71_uart_config __initdata = { | |||
287 | 277 | ||
288 | static struct omap_board_config_kernel palmz71_config[] __initdata = { | 278 | static struct omap_board_config_kernel palmz71_config[] __initdata = { |
289 | {OMAP_TAG_USB, &palmz71_usb_config}, | 279 | {OMAP_TAG_USB, &palmz71_usb_config}, |
290 | {OMAP_TAG_MMC, &palmz71_mmc_config}, | ||
291 | {OMAP_TAG_LCD, &palmz71_lcd_config}, | 280 | {OMAP_TAG_LCD, &palmz71_lcd_config}, |
292 | {OMAP_TAG_UART, &palmz71_uart_config}, | 281 | {OMAP_TAG_UART, &palmz71_uart_config}, |
293 | }; | 282 | }; |
diff --git a/arch/arm/mach-omap1/board-sx1-mmc.c b/arch/arm/mach-omap1/board-sx1-mmc.c index 0be4ebaa2842..0ece109aee41 100644 --- a/arch/arm/mach-omap1/board-sx1-mmc.c +++ b/arch/arm/mach-omap1/board-sx1-mmc.c | |||
@@ -48,59 +48,10 @@ static int sx1_mmc_set_power(struct device *dev, int slot, int power_on, | |||
48 | return sx1_i2c_write_byte(SOFIA_I2C_ADDR, SOFIA_POWER1_REG, dat); | 48 | return sx1_i2c_write_byte(SOFIA_I2C_ADDR, SOFIA_POWER1_REG, dat); |
49 | } | 49 | } |
50 | 50 | ||
51 | static int sx1_mmc_set_bus_mode(struct device *dev, int slot, int bus_mode) | ||
52 | { | ||
53 | #ifdef CONFIG_MMC_DEBUG | ||
54 | dev_dbg(dev, "Set slot %d bus_mode %s\n", slot + 1, | ||
55 | bus_mode == MMC_BUSMODE_OPENDRAIN ? "open-drain" : "push-pull"); | ||
56 | #endif | ||
57 | if (slot != 0) { | ||
58 | dev_err(dev, "No such slot %d\n", slot + 1); | ||
59 | return -ENODEV; | ||
60 | } | ||
61 | |||
62 | return 0; | ||
63 | } | ||
64 | |||
65 | static int sx1_mmc_get_cover_state(struct device *dev, int slot) | ||
66 | { | ||
67 | BUG_ON(slot != 0); | ||
68 | |||
69 | return slot_cover_open; | ||
70 | } | ||
71 | |||
72 | void sx1_mmc_slot_cover_handler(void *arg, int state) | ||
73 | { | ||
74 | if (mmc_device == NULL) | ||
75 | return; | ||
76 | |||
77 | slot_cover_open = state; | ||
78 | omap_mmc_notify_cover_event(mmc_device, 0, state); | ||
79 | } | ||
80 | |||
81 | static int sx1_mmc_late_init(struct device *dev) | ||
82 | { | ||
83 | int ret = 0; | ||
84 | |||
85 | mmc_device = dev; | ||
86 | |||
87 | return ret; | ||
88 | } | ||
89 | |||
90 | static void sx1_mmc_cleanup(struct device *dev) | ||
91 | { | ||
92 | } | ||
93 | |||
94 | static struct omap_mmc_platform_data sx1_mmc_data = { | 51 | static struct omap_mmc_platform_data sx1_mmc_data = { |
95 | .nr_slots = 1, | 52 | .nr_slots = 1, |
96 | .switch_slot = NULL, | ||
97 | .init = sx1_mmc_late_init, | ||
98 | .cleanup = sx1_mmc_cleanup, | ||
99 | .slots[0] = { | 53 | .slots[0] = { |
100 | .set_power = sx1_mmc_set_power, | 54 | .set_power = sx1_mmc_set_power, |
101 | .set_bus_mode = sx1_mmc_set_bus_mode, | ||
102 | .get_ro = NULL, | ||
103 | .get_cover_state = sx1_mmc_get_cover_state, | ||
104 | .ocr_mask = MMC_VDD_28_29 | MMC_VDD_30_31 | | 55 | .ocr_mask = MMC_VDD_28_29 | MMC_VDD_30_31 | |
105 | MMC_VDD_32_33 | MMC_VDD_33_34, | 56 | MMC_VDD_32_33 | MMC_VDD_33_34, |
106 | .name = "mmcblk", | 57 | .name = "mmcblk", |
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 93bd395b9972..8171fe0ca082 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c | |||
@@ -378,15 +378,6 @@ static struct omap_usb_config sx1_usb_config __initdata = { | |||
378 | .pins[2] = 0, | 378 | .pins[2] = 0, |
379 | }; | 379 | }; |
380 | 380 | ||
381 | /*----------- MMC -------------------------*/ | ||
382 | |||
383 | static struct omap_mmc_config sx1_mmc_config __initdata = { | ||
384 | .mmc [0] = { | ||
385 | .enabled = 1, | ||
386 | .wire4 = 0, | ||
387 | }, | ||
388 | }; | ||
389 | |||
390 | /*----------- LCD -------------------------*/ | 381 | /*----------- LCD -------------------------*/ |
391 | 382 | ||
392 | static struct platform_device sx1_lcd_device = { | 383 | static struct platform_device sx1_lcd_device = { |
@@ -414,7 +405,6 @@ static struct omap_uart_config sx1_uart_config __initdata = { | |||
414 | 405 | ||
415 | static struct omap_board_config_kernel sx1_config[] __initdata = { | 406 | static struct omap_board_config_kernel sx1_config[] __initdata = { |
416 | { OMAP_TAG_USB, &sx1_usb_config }, | 407 | { OMAP_TAG_USB, &sx1_usb_config }, |
417 | { OMAP_TAG_MMC, &sx1_mmc_config }, | ||
418 | { OMAP_TAG_LCD, &sx1_lcd_config }, | 408 | { OMAP_TAG_LCD, &sx1_lcd_config }, |
419 | { OMAP_TAG_UART, &sx1_uart_config }, | 409 | { OMAP_TAG_UART, &sx1_uart_config }, |
420 | }; | 410 | }; |
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index 92c9de1090a9..c224f3c64235 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
17 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
18 | #include <linux/irq.h> | ||
18 | #include <linux/init.h> | 19 | #include <linux/init.h> |
19 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
20 | #include <linux/notifier.h> | 21 | #include <linux/notifier.h> |
@@ -140,21 +141,12 @@ static struct omap_usb_config voiceblue_usb_config __initdata = { | |||
140 | .pins[2] = 6, | 141 | .pins[2] = 6, |
141 | }; | 142 | }; |
142 | 143 | ||
143 | static struct omap_mmc_config voiceblue_mmc_config __initdata = { | ||
144 | .mmc[0] = { | ||
145 | .enabled = 1, | ||
146 | .power_pin = 2, | ||
147 | .switch_pin = -1, | ||
148 | }, | ||
149 | }; | ||
150 | |||
151 | static struct omap_uart_config voiceblue_uart_config __initdata = { | 144 | static struct omap_uart_config voiceblue_uart_config __initdata = { |
152 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | 145 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), |
153 | }; | 146 | }; |
154 | 147 | ||
155 | static struct omap_board_config_kernel voiceblue_config[] = { | 148 | static struct omap_board_config_kernel voiceblue_config[] = { |
156 | { OMAP_TAG_USB, &voiceblue_usb_config }, | 149 | { OMAP_TAG_USB, &voiceblue_usb_config }, |
157 | { OMAP_TAG_MMC, &voiceblue_mmc_config }, | ||
158 | { OMAP_TAG_UART, &voiceblue_uart_config }, | 150 | { OMAP_TAG_UART, &voiceblue_uart_config }, |
159 | }; | 151 | }; |
160 | 152 | ||
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 | ||