diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-07-25 08:13:09 +0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-07-25 08:13:09 +0400 |
commit | a3fd869a6425082f6014ded43684508602319900 (patch) | |
tree | f73df467182529f27c7a9c154202a3498dd5f792 /arch/sh/boards/board-sh2007.c | |
parent | 90eed7d87b748f9c0d11b9bad64a4c41e31b78c4 (diff) | |
parent | 89d71486b293565aa345e1b722647cb29ade465c (diff) | |
download | linux-a3fd869a6425082f6014ded43684508602319900.tar.xz |
Merge branches 'sh/urgent' and 'sh/regulator' into sh-latest
Diffstat (limited to 'arch/sh/boards/board-sh2007.c')
-rw-r--r-- | arch/sh/boards/board-sh2007.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/sh/boards/board-sh2007.c b/arch/sh/boards/board-sh2007.c index b90b78f6a829..1980bb7e5780 100644 --- a/arch/sh/boards/board-sh2007.c +++ b/arch/sh/boards/board-sh2007.c @@ -6,6 +6,8 @@ */ #include <linux/init.h> #include <linux/irq.h> +#include <linux/regulator/fixed.h> +#include <linux/regulator/machine.h> #include <linux/smsc911x.h> #include <linux/platform_device.h> #include <linux/ata_platform.h> @@ -13,6 +15,14 @@ #include <asm/machvec.h> #include <mach/sh2007.h> +/* Dummy supplies, where voltage doesn't matter */ +static struct regulator_consumer_supply dummy_supplies[] = { + REGULATOR_SUPPLY("vddvario", "smsc911x.0"), + REGULATOR_SUPPLY("vdd33a", "smsc911x.0"), + REGULATOR_SUPPLY("vddvario", "smsc911x.1"), + REGULATOR_SUPPLY("vdd33a", "smsc911x.1"), +}; + struct smsc911x_platform_config smc911x_info = { .flags = SMSC911X_USE_32BIT, .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW, @@ -98,6 +108,8 @@ static struct platform_device *sh2007_devices[] __initdata = { static int __init sh2007_io_init(void) { + regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); + platform_add_devices(sh2007_devices, ARRAY_SIZE(sh2007_devices)); return 0; } |