diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-generic.c')
-rw-r--r-- | arch/arm/mach-omap1/board-generic.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index 33d01adab1ed..c711bf23f7b4 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c | |||
@@ -55,33 +55,14 @@ static struct omap_usb_config generic1610_usb_config __initdata = { | |||
55 | .hmc_mode = 16, | 55 | .hmc_mode = 16, |
56 | .pins[0] = 6, | 56 | .pins[0] = 6, |
57 | }; | 57 | }; |
58 | |||
59 | static struct omap_mmc_config generic_mmc_config __initdata = { | ||
60 | .mmc [0] = { | ||
61 | .enabled = 0, | ||
62 | .wire4 = 0, | ||
63 | .wp_pin = -1, | ||
64 | .power_pin = -1, | ||
65 | .switch_pin = -1, | ||
66 | }, | ||
67 | .mmc [1] = { | ||
68 | .enabled = 0, | ||
69 | .wire4 = 0, | ||
70 | .wp_pin = -1, | ||
71 | .power_pin = -1, | ||
72 | .switch_pin = -1, | ||
73 | }, | ||
74 | }; | ||
75 | |||
76 | #endif | 58 | #endif |
77 | 59 | ||
78 | static struct omap_uart_config generic_uart_config __initdata = { | 60 | static struct omap_uart_config generic_uart_config __initdata = { |
79 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | 61 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), |
80 | }; | 62 | }; |
81 | 63 | ||
82 | static struct omap_board_config_kernel generic_config[] = { | 64 | static struct omap_board_config_kernel generic_config[] __initdata = { |
83 | { OMAP_TAG_USB, NULL }, | 65 | { OMAP_TAG_USB, NULL }, |
84 | { OMAP_TAG_MMC, &generic_mmc_config }, | ||
85 | { OMAP_TAG_UART, &generic_uart_config }, | 66 | { OMAP_TAG_UART, &generic_uart_config }, |
86 | }; | 67 | }; |
87 | 68 | ||
@@ -101,6 +82,7 @@ static void __init omap_generic_init(void) | |||
101 | omap_board_config = generic_config; | 82 | omap_board_config = generic_config; |
102 | omap_board_config_size = ARRAY_SIZE(generic_config); | 83 | omap_board_config_size = ARRAY_SIZE(generic_config); |
103 | omap_serial_init(); | 84 | omap_serial_init(); |
85 | omap_register_i2c_bus(1, 100, NULL, 0); | ||
104 | } | 86 | } |
105 | 87 | ||
106 | static void __init omap_generic_map_io(void) | 88 | static void __init omap_generic_map_io(void) |