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-rsk/setup.c | |
| 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-rsk/setup.c')
| -rw-r--r-- | arch/sh/boards/mach-rsk/setup.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/sh/boards/mach-rsk/setup.c b/arch/sh/boards/mach-rsk/setup.c index 895f030070d3..2685ea03b064 100644 --- a/arch/sh/boards/mach-rsk/setup.c +++ b/arch/sh/boards/mach-rsk/setup.c @@ -16,9 +16,17 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> #include <linux/mtd/map.h> +#include <linux/regulator/fixed.h> +#include <linux/regulator/machine.h> #include <asm/machvec.h> #include <asm/io.h> +/* Dummy supplies, where voltage doesn't matter */ +static struct regulator_consumer_supply dummy_supplies[] = { + REGULATOR_SUPPLY("vddvario", "smsc911x"), + REGULATOR_SUPPLY("vdd33a", "smsc911x"), +}; + static const char *part_probes[] = { "cmdlinepart", NULL }; static struct mtd_partition rsk_partitions[] = { @@ -67,6 +75,8 @@ static struct platform_device *rsk_devices[] __initdata = { static int __init rsk_devices_setup(void) { + regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); + return platform_add_devices(rsk_devices, ARRAY_SIZE(rsk_devices)); } |