diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:08:06 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:08:06 +0200 |
| commit | 45c7a01f070146e08f5c838315ffca5ade6e3844 (patch) | |
| tree | e69553e240c2ee2875df5dc9ba2baa45802f6175 | |
| parent | cfc073bafb93dc18c9a09de195841b7a7a32a8e2 (diff) | |
| parent | b354e2272ac6fddd19cfd5732bda23974f7b4ee6 (diff) | |
| download | talos-obmc-linux-45c7a01f070146e08f5c838315ffca5ade6e3844.tar.gz talos-obmc-linux-45c7a01f070146e08f5c838315ffca5ade6e3844.zip | |
Merge branch 'renesas-marzen' into renesas-board
* renesas-marzen:
ARM: mach-shmobile: add fixed voltage regulators to marzen
| -rw-r--r-- | arch/arm/mach-shmobile/board-marzen.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 14de3787cafc..3a528cf4366c 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -27,6 +27,8 @@ #include <linux/io.h> #include <linux/gpio.h> #include <linux/dma-mapping.h> +#include <linux/regulator/fixed.h> +#include <linux/regulator/machine.h> #include <linux/smsc911x.h> #include <mach/hardware.h> #include <mach/r8a7779.h> @@ -37,6 +39,12 @@ #include <asm/hardware/gic.h> #include <asm/traps.h> +/* Dummy supplies, where voltage doesn't matter */ +static struct regulator_consumer_supply dummy_supplies[] = { + REGULATOR_SUPPLY("vddvario", "smsc911x"), + REGULATOR_SUPPLY("vdd33a", "smsc911x"), +}; + /* SMSC LAN89218 */ static struct resource smsc911x_resources[] = { [0] = { @@ -73,6 +81,8 @@ static struct platform_device *marzen_devices[] __initdata = { static void __init marzen_init(void) { + regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); + r8a7779_pinmux_init(); /* SCIF2 (CN18: DEBUG0) */ |
