diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2009-05-28 17:04:03 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 17:04:03 -0400 |
commit | bb3b9d8eb97624956e7e3a9eba2c64576808b1dc (patch) | |
tree | b62b08c1a12b9fc71e1b01ad849f8486ab6cd420 /arch/arm/mach-omap2/board-omap3beagle.c | |
parent | b583f26d510ee1aef7348f38f1d959212f66b5e5 (diff) |
ARM: OMAP3: Initialize regulators for Beagle and Overo
Initialize regulators for Beagle and Overo.
Patch is based on earlier patches posted to linux-omap mailing
list.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 104 |
1 files changed, 95 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index f25082c53c67..991ac9c38032 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/mtd/partitions.h> | 28 | #include <linux/mtd/partitions.h> |
29 | #include <linux/mtd/nand.h> | 29 | #include <linux/mtd/nand.h> |
30 | 30 | ||
31 | #include <linux/regulator/machine.h> | ||
31 | #include <linux/i2c/twl4030.h> | 32 | #include <linux/i2c/twl4030.h> |
32 | 33 | ||
33 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
@@ -120,6 +121,23 @@ static struct twl4030_hsmmc_info mmc[] = { | |||
120 | {} /* Terminator */ | 121 | {} /* Terminator */ |
121 | }; | 122 | }; |
122 | 123 | ||
124 | static struct platform_device omap3_beagle_lcd_device = { | ||
125 | .name = "omap3beagle_lcd", | ||
126 | .id = -1, | ||
127 | }; | ||
128 | |||
129 | static struct omap_lcd_config omap3_beagle_lcd_config __initdata = { | ||
130 | .ctrl_name = "internal", | ||
131 | }; | ||
132 | |||
133 | static struct regulator_consumer_supply beagle_vmmc1_supply = { | ||
134 | .supply = "vmmc", | ||
135 | }; | ||
136 | |||
137 | static struct regulator_consumer_supply beagle_vsim_supply = { | ||
138 | .supply = "vmmc_aux", | ||
139 | }; | ||
140 | |||
123 | static struct gpio_led gpio_leds[]; | 141 | static struct gpio_led gpio_leds[]; |
124 | 142 | ||
125 | static int beagle_twl_gpio_setup(struct device *dev, | 143 | static int beagle_twl_gpio_setup(struct device *dev, |
@@ -130,6 +148,10 @@ static int beagle_twl_gpio_setup(struct device *dev, | |||
130 | mmc[0].gpio_cd = gpio + 0; | 148 | mmc[0].gpio_cd = gpio + 0; |
131 | twl4030_mmc_init(mmc); | 149 | twl4030_mmc_init(mmc); |
132 | 150 | ||
151 | /* link regulators to MMC adapters */ | ||
152 | beagle_vmmc1_supply.dev = mmc[0].dev; | ||
153 | beagle_vsim_supply.dev = mmc[0].dev; | ||
154 | |||
133 | /* REVISIT: need ehci-omap hooks for external VBUS | 155 | /* REVISIT: need ehci-omap hooks for external VBUS |
134 | * power switch and overcurrent detect | 156 | * power switch and overcurrent detect |
135 | */ | 157 | */ |
@@ -158,12 +180,85 @@ static struct twl4030_gpio_platform_data beagle_gpio_data = { | |||
158 | .setup = beagle_twl_gpio_setup, | 180 | .setup = beagle_twl_gpio_setup, |
159 | }; | 181 | }; |
160 | 182 | ||
183 | static struct regulator_consumer_supply beagle_vdac_supply = { | ||
184 | .supply = "vdac", | ||
185 | .dev = &omap3_beagle_lcd_device.dev, | ||
186 | }; | ||
187 | |||
188 | static struct regulator_consumer_supply beagle_vdvi_supply = { | ||
189 | .supply = "vdvi", | ||
190 | .dev = &omap3_beagle_lcd_device.dev, | ||
191 | }; | ||
192 | |||
193 | /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ | ||
194 | static struct regulator_init_data beagle_vmmc1 = { | ||
195 | .constraints = { | ||
196 | .min_uV = 1850000, | ||
197 | .max_uV = 3150000, | ||
198 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
199 | | REGULATOR_MODE_STANDBY, | ||
200 | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | ||
201 | | REGULATOR_CHANGE_MODE | ||
202 | | REGULATOR_CHANGE_STATUS, | ||
203 | }, | ||
204 | .num_consumer_supplies = 1, | ||
205 | .consumer_supplies = &beagle_vmmc1_supply, | ||
206 | }; | ||
207 | |||
208 | /* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */ | ||
209 | static struct regulator_init_data beagle_vsim = { | ||
210 | .constraints = { | ||
211 | .min_uV = 1800000, | ||
212 | .max_uV = 3000000, | ||
213 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
214 | | REGULATOR_MODE_STANDBY, | ||
215 | .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | ||
216 | | REGULATOR_CHANGE_MODE | ||
217 | | REGULATOR_CHANGE_STATUS, | ||
218 | }, | ||
219 | .num_consumer_supplies = 1, | ||
220 | .consumer_supplies = &beagle_vsim_supply, | ||
221 | }; | ||
222 | |||
223 | /* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */ | ||
224 | static struct regulator_init_data beagle_vdac = { | ||
225 | .constraints = { | ||
226 | .min_uV = 1800000, | ||
227 | .max_uV = 1800000, | ||
228 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
229 | | REGULATOR_MODE_STANDBY, | ||
230 | .valid_ops_mask = REGULATOR_CHANGE_MODE | ||
231 | | REGULATOR_CHANGE_STATUS, | ||
232 | }, | ||
233 | .num_consumer_supplies = 1, | ||
234 | .consumer_supplies = &beagle_vdac_supply, | ||
235 | }; | ||
236 | |||
237 | /* VPLL2 for digital video outputs */ | ||
238 | static struct regulator_init_data beagle_vpll2 = { | ||
239 | .constraints = { | ||
240 | .name = "VDVI", | ||
241 | .min_uV = 1800000, | ||
242 | .max_uV = 1800000, | ||
243 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
244 | | REGULATOR_MODE_STANDBY, | ||
245 | .valid_ops_mask = REGULATOR_CHANGE_MODE | ||
246 | | REGULATOR_CHANGE_STATUS, | ||
247 | }, | ||
248 | .num_consumer_supplies = 1, | ||
249 | .consumer_supplies = &beagle_vdvi_supply, | ||
250 | }; | ||
251 | |||
161 | static struct twl4030_platform_data beagle_twldata = { | 252 | static struct twl4030_platform_data beagle_twldata = { |
162 | .irq_base = TWL4030_IRQ_BASE, | 253 | .irq_base = TWL4030_IRQ_BASE, |
163 | .irq_end = TWL4030_IRQ_END, | 254 | .irq_end = TWL4030_IRQ_END, |
164 | 255 | ||
165 | /* platform_data for children goes here */ | 256 | /* platform_data for children goes here */ |
166 | .gpio = &beagle_gpio_data, | 257 | .gpio = &beagle_gpio_data, |
258 | .vmmc1 = &beagle_vmmc1, | ||
259 | .vsim = &beagle_vsim, | ||
260 | .vdac = &beagle_vdac, | ||
261 | .vpll2 = &beagle_vpll2, | ||
167 | }; | 262 | }; |
168 | 263 | ||
169 | static struct i2c_board_info __initdata beagle_i2c_boardinfo[] = { | 264 | static struct i2c_board_info __initdata beagle_i2c_boardinfo[] = { |
@@ -195,15 +290,6 @@ static void __init omap3_beagle_init_irq(void) | |||
195 | omap_gpio_init(); | 290 | omap_gpio_init(); |
196 | } | 291 | } |
197 | 292 | ||
198 | static struct platform_device omap3_beagle_lcd_device = { | ||
199 | .name = "omap3beagle_lcd", | ||
200 | .id = -1, | ||
201 | }; | ||
202 | |||
203 | static struct omap_lcd_config omap3_beagle_lcd_config __initdata = { | ||
204 | .ctrl_name = "internal", | ||
205 | }; | ||
206 | |||
207 | static struct gpio_led gpio_leds[] = { | 293 | static struct gpio_led gpio_leds[] = { |
208 | { | 294 | { |
209 | .name = "beagleboard::usr0", | 295 | .name = "beagleboard::usr0", |