diff options
-rw-r--r-- | arch/arm/mach-shmobile/board-g4evm.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-g4evm.c b/arch/arm/mach-shmobile/board-g4evm.c index af9c3e2d3b83..fa5dfc5c8ed6 100644 --- a/arch/arm/mach-shmobile/board-g4evm.c +++ b/arch/arm/mach-shmobile/board-g4evm.c | |||
@@ -26,6 +26,8 @@ | |||
26 | #include <linux/mtd/mtd.h> | 26 | #include <linux/mtd/mtd.h> |
27 | #include <linux/mtd/partitions.h> | 27 | #include <linux/mtd/partitions.h> |
28 | #include <linux/mtd/physmap.h> | 28 | #include <linux/mtd/physmap.h> |
29 | #include <linux/regulator/fixed.h> | ||
30 | #include <linux/regulator/machine.h> | ||
29 | #include <linux/usb/r8a66597.h> | 31 | #include <linux/usb/r8a66597.h> |
30 | #include <linux/io.h> | 32 | #include <linux/io.h> |
31 | #include <linux/input.h> | 33 | #include <linux/input.h> |
@@ -196,6 +198,15 @@ static struct platform_device keysc_device = { | |||
196 | }, | 198 | }, |
197 | }; | 199 | }; |
198 | 200 | ||
201 | /* Fixed 3.3V regulator to be used by SDHI0 and SDHI1 */ | ||
202 | static struct regulator_consumer_supply fixed3v3_power_consumers[] = | ||
203 | { | ||
204 | REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"), | ||
205 | REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"), | ||
206 | REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"), | ||
207 | REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.1"), | ||
208 | }; | ||
209 | |||
199 | /* SDHI */ | 210 | /* SDHI */ |
200 | static struct sh_mobile_sdhi_info sdhi0_info = { | 211 | static struct sh_mobile_sdhi_info sdhi0_info = { |
201 | .tmio_caps = MMC_CAP_SDIO_IRQ, | 212 | .tmio_caps = MMC_CAP_SDIO_IRQ, |
@@ -273,6 +284,9 @@ static struct platform_device *g4evm_devices[] __initdata = { | |||
273 | 284 | ||
274 | static void __init g4evm_init(void) | 285 | static void __init g4evm_init(void) |
275 | { | 286 | { |
287 | regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers, | ||
288 | ARRAY_SIZE(fixed3v3_power_consumers), 3300000); | ||
289 | |||
276 | sh7377_pinmux_init(); | 290 | sh7377_pinmux_init(); |
277 | 291 | ||
278 | /* Lit DS14 LED */ | 292 | /* Lit DS14 LED */ |