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/board-magicpanelr2.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/board-magicpanelr2.c')
| -rw-r--r-- | arch/sh/boards/board-magicpanelr2.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/sh/boards/board-magicpanelr2.c b/arch/sh/boards/board-magicpanelr2.c index 90568f9de3a4..20500858b56c 100644 --- a/arch/sh/boards/board-magicpanelr2.c +++ b/arch/sh/boards/board-magicpanelr2.c @@ -14,6 +14,8 @@ #include <linux/platform_device.h> #include <linux/delay.h> #include <linux/gpio.h> +#include <linux/regulator/fixed.h> +#include <linux/regulator/machine.h> #include <linux/smsc911x.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> @@ -24,6 +26,12 @@ #include <asm/heartbeat.h> #include <cpu/sh7720.h> +/* Dummy supplies, where voltage doesn't matter */ +static struct regulator_consumer_supply dummy_supplies[] = { + REGULATOR_SUPPLY("vddvario", "smsc911x"), + REGULATOR_SUPPLY("vdd33a", "smsc911x"), +}; + #define LAN9115_READY (__raw_readl(0xA8000084UL) & 0x00000001UL) /* Wait until reset finished. Timeout is 100ms. */ @@ -348,6 +356,8 @@ static struct platform_device *mpr2_devices[] __initdata = { static int __init mpr2_devices_setup(void) { + regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); + return platform_add_devices(mpr2_devices, ARRAY_SIZE(mpr2_devices)); } device_initcall(mpr2_devices_setup); |