aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorvikram pandita <vikram.pandita@ti.com>2009-11-22 13:11:30 -0500
committerTony Lindgren <tony@atomide.com>2009-11-22 13:24:33 -0500
commit479f12c9e2743084ace94d8c65b98ec536cae3cf (patch)
tree637702557b2792e59e1a5a0b8bd009ac837fd526 /arch/arm
parent562138a4487191b5bcc0bea591368db7b3d3900a (diff)
omap3: zoom: split board file for software reuse
Split zoom2 board file into a base board file and a board-zoom-peripherals.c file. That way the same peripherals file can be reused for zoom3 and sdp3630 in addition to zoom2. Also remove unused struct omap_board_config_kernel entry. NOTE: Keep the twl4030_madc_platform_data and twl4030_platform_data entries in board-zoom2.c to avoid merge conflicts with the pending patches in MFD tree. These entries will be removed later as a fix. Following list shows the commonality across the three platforms and hence the case for software reuse: Peripheral zoom2 zoom3 sdp3630 --------------------------------------- Ethernet smsc smsc smc NOR n/a n/a B Onenand n/a n/a B HDMI A A B (present on different i2c) NAND A A A (same nand) SDRAM A A A (same sdram) Keypad A A A (same twl) Camera A A A (same sensor can be mounted) LCD Display A A A (same wvga display) OPPs A A A (same chip feature) Audio A A A (same audio via twl5030) Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/Makefile1
-rw-r--r--arch/arm/mach-omap2/board-zoom-peripherals.c268
-rw-r--r--arch/arm/mach-omap2/board-zoom2.c231
3 files changed, 275 insertions, 225 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index b77fe2463692..8ac121edfa4a 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -75,6 +75,7 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
75 board-rx51-peripherals.o \ 75 board-rx51-peripherals.o \
76 mmc-twl4030.o 76 mmc-twl4030.o
77obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \ 77obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \
78 board-zoom-peripherals.o \
78 mmc-twl4030.o \ 79 mmc-twl4030.o \
79 board-zoom-debugboard.o 80 board-zoom-debugboard.o
80 81
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
new file mode 100644
index 000000000000..75cbbe747246
--- /dev/null
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -0,0 +1,268 @@
1/*
2 * Copyright (C) 2009 Texas Instruments Inc.
3 *
4 * Modified from mach-omap2/board-zoom2.c
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */
10
11#include <linux/kernel.h>
12#include <linux/init.h>
13#include <linux/platform_device.h>
14#include <linux/input.h>
15#include <linux/input/matrix_keypad.h>
16#include <linux/gpio.h>
17#include <linux/i2c/twl4030.h>
18#include <linux/regulator/machine.h>
19
20#include <asm/mach-types.h>
21#include <asm/mach/arch.h>
22#include <asm/mach/map.h>
23
24#include <plat/common.h>
25#include <plat/usb.h>
26
27#include "mmc-twl4030.h"
28
29/* Zoom2 has Qwerty keyboard*/
30static int board_keymap[] = {
31 KEY(0, 0, KEY_E),
32 KEY(0, 1, KEY_R),
33 KEY(0, 2, KEY_T),
34 KEY(0, 3, KEY_HOME),
35 KEY(0, 6, KEY_I),
36 KEY(0, 7, KEY_LEFTSHIFT),
37 KEY(1, 0, KEY_D),
38 KEY(1, 1, KEY_F),
39 KEY(1, 2, KEY_G),
40 KEY(1, 3, KEY_SEND),
41 KEY(1, 6, KEY_K),
42 KEY(1, 7, KEY_ENTER),
43 KEY(2, 0, KEY_X),
44 KEY(2, 1, KEY_C),
45 KEY(2, 2, KEY_V),
46 KEY(2, 3, KEY_END),
47 KEY(2, 6, KEY_DOT),
48 KEY(2, 7, KEY_CAPSLOCK),
49 KEY(3, 0, KEY_Z),
50 KEY(3, 1, KEY_KPPLUS),
51 KEY(3, 2, KEY_B),
52 KEY(3, 3, KEY_F1),
53 KEY(3, 6, KEY_O),
54 KEY(3, 7, KEY_SPACE),
55 KEY(4, 0, KEY_W),
56 KEY(4, 1, KEY_Y),
57 KEY(4, 2, KEY_U),
58 KEY(4, 3, KEY_F2),
59 KEY(4, 4, KEY_VOLUMEUP),
60 KEY(4, 6, KEY_L),
61 KEY(4, 7, KEY_LEFT),
62 KEY(5, 0, KEY_S),
63 KEY(5, 1, KEY_H),
64 KEY(5, 2, KEY_J),
65 KEY(5, 3, KEY_F3),
66 KEY(5, 5, KEY_VOLUMEDOWN),
67 KEY(5, 6, KEY_M),
68 KEY(5, 7, KEY_ENTER),
69 KEY(6, 0, KEY_Q),
70 KEY(6, 1, KEY_A),
71 KEY(6, 2, KEY_N),
72 KEY(6, 3, KEY_BACKSPACE),
73 KEY(6, 6, KEY_P),
74 KEY(6, 7, KEY_SELECT),
75 KEY(7, 0, KEY_PROG1), /*MACRO 1 <User defined> */
76 KEY(7, 1, KEY_PROG2), /*MACRO 2 <User defined> */
77 KEY(7, 2, KEY_PROG3), /*MACRO 3 <User defined> */
78 KEY(7, 3, KEY_PROG4), /*MACRO 4 <User defined> */
79 KEY(7, 5, KEY_RIGHT),
80 KEY(7, 6, KEY_UP),
81 KEY(7, 7, KEY_DOWN)
82};
83
84static struct matrix_keymap_data board_map_data = {
85 .keymap = board_keymap,
86 .keymap_size = ARRAY_SIZE(board_keymap),
87};
88
89static struct twl4030_keypad_data zoom2_kp_twl4030_data = {
90 .keymap_data = &board_map_data,
91 .rows = 8,
92 .cols = 8,
93 .rep = 1,
94};
95
96static struct regulator_consumer_supply zoom2_vmmc1_supply = {
97 .supply = "vmmc",
98};
99
100static struct regulator_consumer_supply zoom2_vsim_supply = {
101 .supply = "vmmc_aux",
102};
103
104static struct regulator_consumer_supply zoom2_vmmc2_supply = {
105 .supply = "vmmc",
106};
107
108/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
109static struct regulator_init_data zoom2_vmmc1 = {
110 .constraints = {
111 .min_uV = 1850000,
112 .max_uV = 3150000,
113 .valid_modes_mask = REGULATOR_MODE_NORMAL
114 | REGULATOR_MODE_STANDBY,
115 .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
116 | REGULATOR_CHANGE_MODE
117 | REGULATOR_CHANGE_STATUS,
118 },
119 .num_consumer_supplies = 1,
120 .consumer_supplies = &zoom2_vmmc1_supply,
121};
122
123/* VMMC2 for MMC2 card */
124static struct regulator_init_data zoom2_vmmc2 = {
125 .constraints = {
126 .min_uV = 1850000,
127 .max_uV = 1850000,
128 .apply_uV = true,
129 .valid_modes_mask = REGULATOR_MODE_NORMAL
130 | REGULATOR_MODE_STANDBY,
131 .valid_ops_mask = REGULATOR_CHANGE_MODE
132 | REGULATOR_CHANGE_STATUS,
133 },
134 .num_consumer_supplies = 1,
135 .consumer_supplies = &zoom2_vmmc2_supply,
136};
137
138/* VSIM for OMAP VDD_MMC1A (i/o for DAT4..DAT7) */
139static struct regulator_init_data zoom2_vsim = {
140 .constraints = {
141 .min_uV = 1800000,
142 .max_uV = 3000000,
143 .valid_modes_mask = REGULATOR_MODE_NORMAL
144 | REGULATOR_MODE_STANDBY,
145 .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
146 | REGULATOR_CHANGE_MODE
147 | REGULATOR_CHANGE_STATUS,
148 },
149 .num_consumer_supplies = 1,
150 .consumer_supplies = &zoom2_vsim_supply,
151};
152
153static struct twl4030_hsmmc_info mmc[] __initdata = {
154 {
155 .mmc = 1,
156 .wires = 4,
157 .gpio_wp = -EINVAL,
158 },
159 {
160 .mmc = 2,
161 .wires = 4,
162 .gpio_wp = -EINVAL,
163 },
164 {} /* Terminator */
165};
166
167static int zoom2_twl_gpio_setup(struct device *dev,
168 unsigned gpio, unsigned ngpio)
169{
170 /* gpio + 0 is "mmc0_cd" (input/IRQ),
171 * gpio + 1 is "mmc1_cd" (input/IRQ)
172 */
173 mmc[0].gpio_cd = gpio + 0;
174 mmc[1].gpio_cd = gpio + 1;
175 twl4030_mmc_init(mmc);
176
177 /* link regulators to MMC adapters ... we "know" the
178 * regulators will be set up only *after* we return.
179 */
180 zoom2_vmmc1_supply.dev = mmc[0].dev;
181 zoom2_vsim_supply.dev = mmc[0].dev;
182 zoom2_vmmc2_supply.dev = mmc[1].dev;
183
184 return 0;
185}
186
187
188static int zoom2_batt_table[] = {
189/* 0 C*/
19030800, 29500, 28300, 27100,
19126000, 24900, 23900, 22900, 22000, 21100, 20300, 19400, 18700, 17900,
19217200, 16500, 15900, 15300, 14700, 14100, 13600, 13100, 12600, 12100,
19311600, 11200, 10800, 10400, 10000, 9630, 9280, 8950, 8620, 8310,
1948020, 7730, 7460, 7200, 6950, 6710, 6470, 6250, 6040, 5830,
1955640, 5450, 5260, 5090, 4920, 4760, 4600, 4450, 4310, 4170,
1964040, 3910, 3790, 3670, 3550
197};
198
199static struct twl4030_bci_platform_data zoom2_bci_data = {
200 .battery_tmp_tbl = zoom2_batt_table,
201 .tblsize = ARRAY_SIZE(zoom2_batt_table),
202};
203
204static struct twl4030_usb_data zoom2_usb_data = {
205 .usb_mode = T2_USB_MODE_ULPI,
206};
207
208static struct twl4030_gpio_platform_data zoom2_gpio_data = {
209 .gpio_base = OMAP_MAX_GPIO_LINES,
210 .irq_base = TWL4030_GPIO_IRQ_BASE,
211 .irq_end = TWL4030_GPIO_IRQ_END,
212 .setup = zoom2_twl_gpio_setup,
213};
214
215static struct twl4030_madc_platform_data zoom2_madc_data = {
216 .irq_line = 1,
217};
218
219static struct twl4030_codec_audio_data zoom2_audio_data = {
220 .audio_mclk = 26000000,
221};
222
223static struct twl4030_codec_data zoom2_codec_data = {
224 .audio_mclk = 26000000,
225 .audio = &zoom2_audio_data,
226};
227
228static struct twl4030_platform_data zoom2_twldata = {
229 .irq_base = TWL4030_IRQ_BASE,
230 .irq_end = TWL4030_IRQ_END,
231
232 /* platform_data for children goes here */
233 .bci = &zoom2_bci_data,
234 .madc = &zoom2_madc_data,
235 .usb = &zoom2_usb_data,
236 .gpio = &zoom2_gpio_data,
237 .keypad = &zoom2_kp_twl4030_data,
238 .codec = &zoom2_codec_data,
239 .vmmc1 = &zoom2_vmmc1,
240 .vmmc2 = &zoom2_vmmc2,
241 .vsim = &zoom2_vsim,
242
243};
244
245static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = {
246 {
247 I2C_BOARD_INFO("twl4030", 0x48),
248 .flags = I2C_CLIENT_WAKE,
249 .irq = INT_34XX_SYS_NIRQ,
250 .platform_data = &zoom2_twldata,
251 },
252};
253
254static int __init omap_i2c_init(void)
255{
256 omap_register_i2c_bus(1, 2600, zoom2_i2c_boardinfo,
257 ARRAY_SIZE(zoom2_i2c_boardinfo));
258 omap_register_i2c_bus(2, 400, NULL, 0);
259 omap_register_i2c_bus(3, 400, NULL, 0);
260 return 0;
261}
262
263void __init zoom_peripherals_init(void)
264{
265 omap_i2c_init();
266 omap_serial_init();
267 usb_musb_init();
268}
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c
index 67abebc46feb..31d485b6859f 100644
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@ -13,232 +13,31 @@
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/platform_device.h> 14#include <linux/platform_device.h>
15#include <linux/input.h> 15#include <linux/input.h>
16#include <linux/input/matrix_keypad.h>
17#include <linux/gpio.h> 16#include <linux/gpio.h>
18#include <linux/i2c/twl4030.h>
19#include <linux/regulator/machine.h>
20 17
21#include <asm/mach-types.h> 18#include <asm/mach-types.h>
22#include <asm/mach/arch.h> 19#include <asm/mach/arch.h>
23 20
24#include <plat/common.h> 21#include <plat/common.h>
25#include <plat/usb.h> 22#include <plat/board.h>
26 23
27#include "mmc-twl4030.h"
28#include "sdram-micron-mt46h32m32lf-6.h" 24#include "sdram-micron-mt46h32m32lf-6.h"
29 25
30/* Zoom2 has Qwerty keyboard*/
31static int board_keymap[] = {
32 KEY(0, 0, KEY_E),
33 KEY(0, 1, KEY_R),
34 KEY(0, 2, KEY_T),
35 KEY(0, 3, KEY_HOME),
36 KEY(0, 6, KEY_I),
37 KEY(0, 7, KEY_LEFTSHIFT),
38 KEY(1, 0, KEY_D),
39 KEY(1, 1, KEY_F),
40 KEY(1, 2, KEY_G),
41 KEY(1, 3, KEY_SEND),
42 KEY(1, 6, KEY_K),
43 KEY(1, 7, KEY_ENTER),
44 KEY(2, 0, KEY_X),
45 KEY(2, 1, KEY_C),
46 KEY(2, 2, KEY_V),
47 KEY(2, 3, KEY_END),
48 KEY(2, 6, KEY_DOT),
49 KEY(2, 7, KEY_CAPSLOCK),
50 KEY(3, 0, KEY_Z),
51 KEY(3, 1, KEY_KPPLUS),
52 KEY(3, 2, KEY_B),
53 KEY(3, 3, KEY_F1),
54 KEY(3, 6, KEY_O),
55 KEY(3, 7, KEY_SPACE),
56 KEY(4, 0, KEY_W),
57 KEY(4, 1, KEY_Y),
58 KEY(4, 2, KEY_U),
59 KEY(4, 3, KEY_F2),
60 KEY(4, 4, KEY_VOLUMEUP),
61 KEY(4, 6, KEY_L),
62 KEY(4, 7, KEY_LEFT),
63 KEY(5, 0, KEY_S),
64 KEY(5, 1, KEY_H),
65 KEY(5, 2, KEY_J),
66 KEY(5, 3, KEY_F3),
67 KEY(5, 5, KEY_VOLUMEDOWN),
68 KEY(5, 6, KEY_M),
69 KEY(5, 7, KEY_ENTER),
70 KEY(6, 0, KEY_Q),
71 KEY(6, 1, KEY_A),
72 KEY(6, 2, KEY_N),
73 KEY(6, 3, KEY_BACKSPACE),
74 KEY(6, 6, KEY_P),
75 KEY(6, 7, KEY_SELECT),
76 KEY(7, 0, KEY_PROG1), /*MACRO 1 <User defined> */
77 KEY(7, 1, KEY_PROG2), /*MACRO 2 <User defined> */
78 KEY(7, 2, KEY_PROG3), /*MACRO 3 <User defined> */
79 KEY(7, 3, KEY_PROG4), /*MACRO 4 <User defined> */
80 KEY(7, 5, KEY_RIGHT),
81 KEY(7, 6, KEY_UP),
82 KEY(7, 7, KEY_DOWN)
83};
84
85static struct matrix_keymap_data board_map_data = {
86 .keymap = board_keymap,
87 .keymap_size = ARRAY_SIZE(board_keymap),
88};
89
90static struct twl4030_keypad_data zoom2_kp_twl4030_data = {
91 .keymap_data = &board_map_data,
92 .rows = 8,
93 .cols = 8,
94 .rep = 1,
95};
96
97static struct omap_board_config_kernel zoom2_config[] __initdata = {
98};
99
100static struct regulator_consumer_supply zoom2_vmmc1_supply = {
101 .supply = "vmmc",
102};
103
104static struct regulator_consumer_supply zoom2_vsim_supply = {
105 .supply = "vmmc_aux",
106};
107
108static struct regulator_consumer_supply zoom2_vmmc2_supply = {
109 .supply = "vmmc",
110};
111
112/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
113static struct regulator_init_data zoom2_vmmc1 = {
114 .constraints = {
115 .min_uV = 1850000,
116 .max_uV = 3150000,
117 .valid_modes_mask = REGULATOR_MODE_NORMAL
118 | REGULATOR_MODE_STANDBY,
119 .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
120 | REGULATOR_CHANGE_MODE
121 | REGULATOR_CHANGE_STATUS,
122 },
123 .num_consumer_supplies = 1,
124 .consumer_supplies = &zoom2_vmmc1_supply,
125};
126
127/* VMMC2 for MMC2 card */
128static struct regulator_init_data zoom2_vmmc2 = {
129 .constraints = {
130 .min_uV = 1850000,
131 .max_uV = 1850000,
132 .apply_uV = true,
133 .valid_modes_mask = REGULATOR_MODE_NORMAL
134 | REGULATOR_MODE_STANDBY,
135 .valid_ops_mask = REGULATOR_CHANGE_MODE
136 | REGULATOR_CHANGE_STATUS,
137 },
138 .num_consumer_supplies = 1,
139 .consumer_supplies = &zoom2_vmmc2_supply,
140};
141
142/* VSIM for OMAP VDD_MMC1A (i/o for DAT4..DAT7) */
143static struct regulator_init_data zoom2_vsim = {
144 .constraints = {
145 .min_uV = 1800000,
146 .max_uV = 3000000,
147 .valid_modes_mask = REGULATOR_MODE_NORMAL
148 | REGULATOR_MODE_STANDBY,
149 .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
150 | REGULATOR_CHANGE_MODE
151 | REGULATOR_CHANGE_STATUS,
152 },
153 .num_consumer_supplies = 1,
154 .consumer_supplies = &zoom2_vsim_supply,
155};
156
157static struct twl4030_hsmmc_info mmc[] __initdata = {
158 {
159 .mmc = 1,
160 .wires = 4,
161 .gpio_wp = -EINVAL,
162 },
163 {
164 .mmc = 2,
165 .wires = 4,
166 .gpio_wp = -EINVAL,
167 },
168 {} /* Terminator */
169};
170
171static int zoom2_twl_gpio_setup(struct device *dev,
172 unsigned gpio, unsigned ngpio)
173{
174 /* gpio + 0 is "mmc0_cd" (input/IRQ),
175 * gpio + 1 is "mmc1_cd" (input/IRQ)
176 */
177 mmc[0].gpio_cd = gpio + 0;
178 mmc[1].gpio_cd = gpio + 1;
179 twl4030_mmc_init(mmc);
180
181 /* link regulators to MMC adapters ... we "know" the
182 * regulators will be set up only *after* we return.
183 */
184 zoom2_vmmc1_supply.dev = mmc[0].dev;
185 zoom2_vsim_supply.dev = mmc[0].dev;
186 zoom2_vmmc2_supply.dev = mmc[1].dev;
187
188 return 0;
189}
190
191
192static int zoom2_batt_table[] = {
193/* 0 C*/
19430800, 29500, 28300, 27100,
19526000, 24900, 23900, 22900, 22000, 21100, 20300, 19400, 18700, 17900,
19617200, 16500, 15900, 15300, 14700, 14100, 13600, 13100, 12600, 12100,
19711600, 11200, 10800, 10400, 10000, 9630, 9280, 8950, 8620, 8310,
1988020, 7730, 7460, 7200, 6950, 6710, 6470, 6250, 6040, 5830,
1995640, 5450, 5260, 5090, 4920, 4760, 4600, 4450, 4310, 4170,
2004040, 3910, 3790, 3670, 3550
201};
202
203static struct twl4030_bci_platform_data zoom2_bci_data = {
204 .battery_tmp_tbl = zoom2_batt_table,
205 .tblsize = ARRAY_SIZE(zoom2_batt_table),
206};
207
208static struct twl4030_usb_data zoom2_usb_data = {
209 .usb_mode = T2_USB_MODE_ULPI,
210};
211
212static void __init omap_zoom2_init_irq(void) 26static void __init omap_zoom2_init_irq(void)
213{ 27{
214 omap_board_config = zoom2_config;
215 omap_board_config_size = ARRAY_SIZE(zoom2_config);
216 omap2_init_common_hw(mt46h32m32lf6_sdrc_params, 28 omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
217 mt46h32m32lf6_sdrc_params); 29 mt46h32m32lf6_sdrc_params);
218 omap_init_irq(); 30 omap_init_irq();
219 omap_gpio_init(); 31 omap_gpio_init();
220} 32}
221 33
222static struct twl4030_gpio_platform_data zoom2_gpio_data = { 34/* REVISIT: These audio entries can be removed once MFD code is merged */
223 .gpio_base = OMAP_MAX_GPIO_LINES, 35#if 0
224 .irq_base = TWL4030_GPIO_IRQ_BASE,
225 .irq_end = TWL4030_GPIO_IRQ_END,
226 .setup = zoom2_twl_gpio_setup,
227};
228 36
229static struct twl4030_madc_platform_data zoom2_madc_data = { 37static struct twl4030_madc_platform_data zoom2_madc_data = {
230 .irq_line = 1, 38 .irq_line = 1,
231}; 39};
232 40
233static struct twl4030_codec_audio_data zoom2_audio_data = {
234 .audio_mclk = 26000000,
235};
236
237static struct twl4030_codec_data zoom2_codec_data = {
238 .audio_mclk = 26000000,
239 .audio = &zoom2_audio_data,
240};
241
242static struct twl4030_platform_data zoom2_twldata = { 41static struct twl4030_platform_data zoom2_twldata = {
243 .irq_base = TWL4030_IRQ_BASE, 42 .irq_base = TWL4030_IRQ_BASE,
244 .irq_end = TWL4030_IRQ_END, 43 .irq_end = TWL4030_IRQ_END,
@@ -249,39 +48,21 @@ static struct twl4030_platform_data zoom2_twldata = {
249 .usb = &zoom2_usb_data, 48 .usb = &zoom2_usb_data,
250 .gpio = &zoom2_gpio_data, 49 .gpio = &zoom2_gpio_data,
251 .keypad = &zoom2_kp_twl4030_data, 50 .keypad = &zoom2_kp_twl4030_data,
252 .codec = &zoom2_codec_data,
253 .vmmc1 = &zoom2_vmmc1, 51 .vmmc1 = &zoom2_vmmc1,
254 .vmmc2 = &zoom2_vmmc2, 52 .vmmc2 = &zoom2_vmmc2,
255 .vsim = &zoom2_vsim, 53 .vsim = &zoom2_vsim,
256 54
257}; 55};
258 56
259static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = { 57#endif
260 {
261 I2C_BOARD_INFO("twl4030", 0x48),
262 .flags = I2C_CLIENT_WAKE,
263 .irq = INT_34XX_SYS_NIRQ,
264 .platform_data = &zoom2_twldata,
265 },
266};
267
268static int __init omap_i2c_init(void)
269{
270 omap_register_i2c_bus(1, 2600, zoom2_i2c_boardinfo,
271 ARRAY_SIZE(zoom2_i2c_boardinfo));
272 omap_register_i2c_bus(2, 400, NULL, 0);
273 omap_register_i2c_bus(3, 400, NULL, 0);
274 return 0;
275}
276 58
277extern int __init omap_zoom2_debugboard_init(void); 59extern int __init omap_zoom2_debugboard_init(void);
60extern void __init zoom_peripherals_init(void);
278 61
279static void __init omap_zoom2_init(void) 62static void __init omap_zoom2_init(void)
280{ 63{
281 omap_i2c_init(); 64 zoom_peripherals_init();
282 omap_serial_init();
283 omap_zoom2_debugboard_init(); 65 omap_zoom2_debugboard_init();
284 usb_musb_init();
285} 66}
286 67
287static void __init omap_zoom2_map_io(void) 68static void __init omap_zoom2_map_io(void)
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-18 15:42:20 -0500