summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-08-29 18:58:15 -0700
committerSimon Horman <horms@verge.net.au>2012-09-06 10:24:17 +0900
commit90b85afcba0ec6242172c636691962ab115e296c (patch)
tree1036e023014b320c8183340b980d629f6d7f0121 /arch/arm
parent894cda18de4b8963b16bc706fea53566df6d7b05 (diff)
downloadop-kernel-dev-90b85afcba0ec6242172c636691962ab115e296c.zip
op-kernel-dev-90b85afcba0ec6242172c636691962ab115e296c.tar.gz
ARM: shmobile: marzen: fixup regulator id for smsc911x
regulator id = 0 is used for sh_mobile_sdhi. smsc911x's regulator can use id = 1 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-shmobile/board-marzen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index dec3ffc..cbf9f25 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -120,7 +120,7 @@ static void __init marzen_init(void)
{
regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
- regulator_register_fixed(0, dummy_supplies,
+ regulator_register_fixed(1, dummy_supplies,
ARRAY_SIZE(dummy_supplies));
r8a7779_pinmux_init();
OpenPOWER on IntegriCloud