diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-07-25 06:13:09 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-07-25 06:13:09 +0200 |
| commit | a3fd869a6425082f6014ded43684508602319900 (patch) | |
| tree | f73df467182529f27c7a9c154202a3498dd5f792 /arch/sh/boards/mach-kfr2r09 | |
| parent | sh: Fix up recursive fault in oops with unset TTB. (diff) | |
| parent | sh: select the fixed regulator driver on several boards (diff) | |
| download | linux-a3fd869a6425082f6014ded43684508602319900.tar.xz linux-a3fd869a6425082f6014ded43684508602319900.zip | |
Merge branches 'sh/urgent' and 'sh/regulator' into sh-latest
Diffstat (limited to 'arch/sh/boards/mach-kfr2r09')
| -rw-r--r-- | arch/sh/boards/mach-kfr2r09/setup.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c index 43a179ce9afc..f2a4304fbe23 100644 --- a/arch/sh/boards/mach-kfr2r09/setup.c +++ b/arch/sh/boards/mach-kfr2r09/setup.c @@ -21,6 +21,8 @@ #include <linux/input.h> #include <linux/input/sh_keysc.h> #include <linux/i2c.h> +#include <linux/regulator/fixed.h> +#include <linux/regulator/machine.h> #include <linux/usb/r8a66597.h> #include <linux/videodev2.h> #include <linux/sh_intc.h> @@ -341,6 +343,13 @@ static struct platform_device kfr2r09_camera = { }, }; +/* Fixed 3.3V regulator to be used by SDHI0 */ +static struct regulator_consumer_supply fixed3v3_power_consumers[] = +{ + REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"), + REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"), +}; + static struct resource kfr2r09_sh_sdhi0_resources[] = { [0] = { .name = "SDHI0", @@ -523,6 +532,9 @@ static int __init kfr2r09_devices_setup(void) &kfr2r09_sdram_leave_start, &kfr2r09_sdram_leave_end); + regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers, + ARRAY_SIZE(fixed3v3_power_consumers), 3300000); + /* enable SCIF1 serial port for YC401 console support */ gpio_request(GPIO_FN_SCIF1_RXD, NULL); gpio_request(GPIO_FN_SCIF1_TXD, NULL); |