diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2012-08-29 21:58:15 -0400 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2012-09-05 21:24:17 -0400 |
commit | 90b85afcba0ec6242172c636691962ab115e296c (patch) | |
tree | 1036e023014b320c8183340b980d629f6d7f0121 /arch/arm/mach-shmobile | |
parent | 894cda18de4b8963b16bc706fea53566df6d7b05 (diff) |
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/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/board-marzen.c | 2 |
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 dec3ffc9df09..cbf9f25ed972 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) | |||
120 | { | 120 | { |
121 | regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers, | 121 | regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers, |
122 | ARRAY_SIZE(fixed3v3_power_consumers), 3300000); | 122 | ARRAY_SIZE(fixed3v3_power_consumers), 3300000); |
123 | regulator_register_fixed(0, dummy_supplies, | 123 | regulator_register_fixed(1, dummy_supplies, |
124 | ARRAY_SIZE(dummy_supplies)); | 124 | ARRAY_SIZE(dummy_supplies)); |
125 | 125 | ||
126 | r8a7779_pinmux_init(); | 126 | r8a7779_pinmux_init(); |