diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-12 01:07:13 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-12 01:07:13 +0400 |
| commit | be4f108862c80af563d45e684eabdff2c9a06d25 (patch) | |
| tree | 8e6f7fca2b8b949106633ed40b4eb581de97cdb8 /arch | |
| parent | 5ae794735c96f7be21a49c4e57fb8579174132be (diff) | |
| parent | d3ed18eae7b6d496e28efac428f4e7f2333ff7c2 (diff) | |
| download | linux-be4f108862c80af563d45e684eabdff2c9a06d25.tar.xz | |
Merge branch 'renesas-bonito' into renesas-board
* renesas-bonito:
ARM: mach-shmobile: add fixed voltage regulators to bonito
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/board-bonito.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c index e9b32cfbf741..4129008eae29 100644 --- a/arch/arm/mach-shmobile/board-bonito.c +++ b/arch/arm/mach-shmobile/board-bonito.c @@ -26,6 +26,8 @@ #include <linux/irq.h> #include <linux/platform_device.h> #include <linux/gpio.h> +#include <linux/regulator/fixed.h> +#include <linux/regulator/machine.h> #include <linux/smsc911x.h> #include <linux/videodev2.h> #include <mach/common.h> @@ -75,6 +77,12 @@ * S38.2 = OFF */ +/* Dummy supplies, where voltage doesn't matter */ +static struct regulator_consumer_supply dummy_supplies[] = { + REGULATOR_SUPPLY("vddvario", "smsc911x"), + REGULATOR_SUPPLY("vdd33a", "smsc911x"), +}; + /* * FPGA */ @@ -360,6 +368,8 @@ static void __init bonito_init(void) { u16 val; + regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); + r8a7740_pinmux_init(); bonito_fpga_init(); |