linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 09/11] ARM: shmobile: marzen: fixup regulator id for smsc911x
Date: Fri, 31 Aug 2012 10:28:20 +0900	[thread overview]
Message-ID: <1346376502-12114-10-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1346376502-12114-1-git-send-email-horms@verge.net.au>

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

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>
---
 arch/arm/mach-shmobile/board-marzen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index 0249c0e..91e81e9 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -196,7 +196,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();
-- 
1.7.10.2.484.gcd07cc5

  parent reply	other threads:[~2012-08-31  1:28 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-31  1:28 [GIT PULL v2] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Simon Horman
2012-08-31  1:28 ` [PATCH 01/11] r8a7779: add SDHI clock support Simon Horman
2012-08-31  1:28 ` [PATCH 02/11] marzen: add SDHI0 support Simon Horman
2012-08-31  1:28 ` [PATCH 03/11] ARM: mach-shmobile: marzen: defconfig update Simon Horman
2012-08-31  1:28 ` [PATCH 04/11] ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx Simon Horman
2012-08-31  1:28 ` [PATCH 05/11] ARM: shmobile: r8a7779: add USB common phy initializer Simon Horman
2012-09-03 21:38   ` Arnd Bergmann
2012-09-04  0:21     ` Kuninori Morimoto
2012-09-04  0:34       ` Simon Horman
2012-09-04  4:50         ` [PATCH] ARM: shmobile: r8a7779: remove USB " Kuninori Morimoto
2012-09-05  1:20           ` Simon Horman
2012-09-05  1:23             ` Simon Horman
2012-09-05  2:00               ` Kuninori Morimoto
2012-09-05  8:13                 ` Simon Horman
2012-09-12  5:16                   ` Simon Horman
2012-09-12  5:31                     ` Kuninori Morimoto
2012-09-12  6:30                       ` Felipe Balbi
2012-09-12  7:16                         ` Kuninori Morimoto
2012-09-12  7:19                           ` Simon Horman
2012-08-31  1:28 ` [PATCH 06/11] ARM: shmobile: r8a7779: add USB EHCI clock support Simon Horman
2012-08-31  1:28 ` [PATCH 07/11] ARM: shmobile: r8a7779: add USB OHCI " Simon Horman
2012-08-31  1:28 ` [PATCH 08/11] ARM: shmobile: marzen: add USB EHCI driver support Simon Horman
2012-08-31  1:28 ` Simon Horman [this message]
2012-08-31  1:28 ` [PATCH 10/11] ARM: shmobile: marzen: enable thermal sensor Simon Horman
2012-08-31  1:28 ` [PATCH 11/11] ARM: shmobile: marzen: add USB OHCI driver support Simon Horman
2012-08-31  6:24 ` [GIT PULL v2] Renesas ARM-based SoC: Marzen and r8a7779 for 3.7 Simon Horman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1346376502-12114-10-git-send-email-horms@verge.net.au \
    --to=horms@verge.net.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).