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-sdk7786/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-sdk7786/setup.c')
| -rw-r--r-- | arch/sh/boards/mach-sdk7786/setup.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/sh/boards/mach-sdk7786/setup.c b/arch/sh/boards/mach-sdk7786/setup.c index 27a2314f50ac..c29268bfd34a 100644 --- a/arch/sh/boards/mach-sdk7786/setup.c +++ b/arch/sh/boards/mach-sdk7786/setup.c @@ -11,6 +11,8 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/regulator/fixed.h> +#include <linux/regulator/machine.h> #include <linux/smsc911x.h> #include <linux/i2c.h> #include <linux/irq.h> @@ -38,6 +40,12 @@ static struct platform_device heartbeat_device = { .resource = &heartbeat_resource, }; +/* Dummy supplies, where voltage doesn't matter */ +static struct regulator_consumer_supply dummy_supplies[] = { + REGULATOR_SUPPLY("vddvario", "smsc911x"), + REGULATOR_SUPPLY("vdd33a", "smsc911x"), +}; + static struct resource smsc911x_resources[] = { [0] = { .name = "smsc911x-memory", @@ -236,6 +244,8 @@ static void __init sdk7786_setup(char **cmdline_p) { pr_info("Renesas Technology Europe SDK7786 support:\n"); + regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); + sdk7786_fpga_init(); sdk7786_nmi_init(); |