From patchwork Sun Nov 14 11:34:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 323262 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAEBauSr020056 for ; Sun, 14 Nov 2010 11:41:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755278Ab0KNLla (ORCPT ); Sun, 14 Nov 2010 06:41:30 -0500 Received: from inca-roads.misterjones.org ([213.251.177.50]:37271 "EHLO inca-roads.misterjones.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755248Ab0KNLl3 (ORCPT ); Sun, 14 Nov 2010 06:41:29 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sun, 14 Nov 2010 11:41:31 +0000 (UTC) X-Greylist: delayed 426 seconds by postgrey-1.27 at vger.kernel.org; Sun, 14 Nov 2010 06:41:29 EST Received: from lopsy-lu.misterjones.org ([93.97.26.37] helo=localhost.localdomain) by inca-roads.misterjones.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1PHaqh-0007AN-0u; Sun, 14 Nov 2010 12:34:19 +0100 From: Marc Zyngier To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Enric Balletbo i Serra , Tony Lindgren Subject: [PATCH] Fix IGEPv2 second MMC channel power supply Date: Sun, 14 Nov 2010 11:34:12 +0000 Message-Id: <1289734452-31625-1-git-send-email-maz@misterjones.org> X-Mailer: git-send-email 1.7.3.2 X-SA-Exim-Connect-IP: 93.97.26.37 X-SA-Exim-Rcpt-To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, eballetbo@gmail.com, tony@atomide.com X-SA-Exim-Mail-From: maz@misterjones.org X-SA-Exim-Scanned: No (on inca-roads.misterjones.org); SAEximRunCond expanded to false Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index 5e035a5..b66d114 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c @@ -257,8 +257,9 @@ static inline void __init igep2_init_smsc911x(void) { } static struct omap_board_config_kernel igep2_config[] __initdata = { }; -static struct regulator_consumer_supply igep2_vmmc1_supply = { - .supply = "vmmc", +static struct regulator_consumer_supply igep2_vmmc1_supplies[] = { + [0] = { .supply = "vmmc", }, + [1] = { .supply = "vmmc", }, }; /* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */ @@ -272,8 +273,8 @@ static struct regulator_init_data igep2_vmmc1 = { | REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, - .num_consumer_supplies = 1, - .consumer_supplies = &igep2_vmmc1_supply, + .num_consumer_supplies = 2, + .consumer_supplies = igep2_vmmc1_supplies, }; static struct omap2_hsmmc_info mmc[] = { @@ -376,7 +377,8 @@ static int igep2_twl_gpio_setup(struct device *dev, * link regulators to MMC adapters ... we "know" the * regulators will be set up only *after* we return. */ - igep2_vmmc1_supply.dev = mmc[0].dev; + igep2_vmmc1_supplies[0].dev = mmc[0].dev; + igep2_vmmc1_supplies[1].dev = mmc[1].dev; /* * REVISIT: need ehci-omap hooks for external VBUS