renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 18:53:52 +08:00
Code

Merge branch 'renesas-marzen' into renesas-board

Browse Source 
* renesas-marzen:
  ARM: mach-shmobile: add fixed voltage regulators to marzen
This commit is contained in:
Rafael J. Wysocki 2012-07-11 23:08:06 +02:00
commit 45c7a01f07
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-shmobile/board-marzen.c
View File

@ -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) */