diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:07:37 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:07:37 +0200 |
| commit | 30a8a0b352141783af855948e0fcf463330736ce (patch) | |
| tree | e1e3c09dcb2831316ee1040af499614e7215a2d0 /arch/arm/mach-shmobile | |
| parent | 633842f1734fd2c92f02acc1a0a122764d6f79c1 (diff) | |
| parent | d252f644789188743b55339f5756a8bcc86fbaa5 (diff) | |
| download | talos-obmc-linux-30a8a0b352141783af855948e0fcf463330736ce.tar.gz talos-obmc-linux-30a8a0b352141783af855948e0fcf463330736ce.zip | |
Merge branch 'renesas-kzm9d' into renesas-board
* renesas-kzm9d:
ARM: mach-shmobile: kzm9d: Add defconfig
ARM: mach-shmobile: add fixed voltage regulators to kzm9d
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/board-kzm9d.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9d.c b/arch/arm/mach-shmobile/board-kzm9d.c index 6a33cf393428..2c986eaae7b4 100644 --- a/arch/arm/mach-shmobile/board-kzm9d.c +++ b/arch/arm/mach-shmobile/board-kzm9d.c @@ -21,6 +21,8 @@ #include <linux/kernel.h> #include <linux/interrupt.h> #include <linux/platform_device.h> +#include <linux/regulator/fixed.h> +#include <linux/regulator/machine.h> #include <linux/smsc911x.h> #include <mach/common.h> #include <mach/emev2.h> @@ -28,6 +30,12 @@ #include <asm/mach/arch.h> #include <asm/hardware/gic.h> +/* Dummy supplies, where voltage doesn't matter */ +static struct regulator_consumer_supply dummy_supplies[] = { + REGULATOR_SUPPLY("vddvario", "smsc911x"), + REGULATOR_SUPPLY("vdd33a", "smsc911x"), +}; + /* Ether */ static struct resource smsc911x_resources[] = { [0] = { @@ -63,6 +71,8 @@ static struct platform_device *kzm9d_devices[] __initdata = { void __init kzm9d_add_standard_devices(void) { + regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); + emev2_add_standard_devices(); platform_add_devices(kzm9d_devices, ARRAY_SIZE(kzm9d_devices)); |
