Skip to content

Commit

Permalink
ARM: mach-shmobile: add fixed voltage regulators to marzen
Browse files Browse the repository at this point in the history
On marzen provide a dummy regulator for the smsc911x driver.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
  • Loading branch information
Guennadi Liakhovetski authored and Rafael J. Wysocki committed Jun 30, 2012
1 parent 21503a8 commit b354e22
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions arch/arm/mach-shmobile/board-marzen.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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] = {
Expand Down Expand Up @@ -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) */
Expand Down

0 comments on commit b354e22

Please sign in to comment.