From patchwork Thu Oct 8 11:58:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 52497 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n98C1Qbq007026 for ; Thu, 8 Oct 2009 12:01:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757850AbZJHMBJ (ORCPT ); Thu, 8 Oct 2009 08:01:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757796AbZJHMBJ (ORCPT ); Thu, 8 Oct 2009 08:01:09 -0400 Received: from smtp.nokia.com ([192.100.122.230]:55046 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757665AbZJHMBE (ORCPT ); Thu, 8 Oct 2009 08:01:04 -0400 Received: from esebh105.NOE.Nokia.com (esebh105.ntc.nokia.com [172.21.138.211]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n98Bx6OM031236; Thu, 8 Oct 2009 14:59:32 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by esebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 8 Oct 2009 14:59:29 +0300 Received: from vaebe101.NOE.Nokia.com ([10.160.244.11]) by vaebh104.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 8 Oct 2009 14:59:28 +0300 Received: from localhost.localdomain ([172.21.40.103]) by vaebe101.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 8 Oct 2009 14:59:27 +0300 From: Eduardo Valentin To: Mark Brown , ext Tony Lindgren Cc: "Ujfalusi Peter (Nokia-D/Tampere)" , "Nurkkala Eero.An (EXT-Offcode/Oulu)" , Jarkko Nikula , Linux-OMAP , ALSA-Devel , Eduardo Valentin Subject: [PATCH 5/8] board-rx51-peripherals: split vaux3 and vmmc2 supplies Date: Thu, 8 Oct 2009 14:58:54 +0300 Message-Id: <1255003137-1034-6-git-send-email-eduardo.valentin@nokia.com> X-Mailer: git-send-email 1.6.4.183.g04423 In-Reply-To: <1255003137-1034-1-git-send-email-eduardo.valentin@nokia.com> References: <1255003137-1034-1-git-send-email-eduardo.valentin@nokia.com> X-OriginalArrivalTime: 08 Oct 2009 11:59:27.0839 (UTC) FILETIME=[C95ABEF0:01CA480E] X-Nokia-AV: Clean 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-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index b227475..92f7dfa 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -125,6 +125,10 @@ static struct regulator_consumer_supply rx51_vmmc1_supply = { .supply = "vmmc", }; +static struct regulator_consumer_supply rx51_vaux3_supply = { + .supply = "vmmc", +}; + static struct regulator_consumer_supply rx51_vmmc2_supply = { .supply = "vmmc", }; @@ -184,7 +188,7 @@ static struct regulator_init_data rx51_vaux3_mmc = { | REGULATOR_CHANGE_STATUS, }, .num_consumer_supplies = 1, - .consumer_supplies = &rx51_vmmc2_supply, + .consumer_supplies = &rx51_vaux3_supply, }; static struct regulator_init_data rx51_vaux4 = { @@ -266,7 +270,7 @@ static int rx51_twlgpio_setup(struct device *dev, unsigned gpio, unsigned n) /* set up MMC adapters, linking their regulators to them */ twl4030_mmc_init(mmc); rx51_vmmc1_supply.dev = mmc[0].dev; - rx51_vmmc2_supply.dev = mmc[1].dev; + rx51_vaux3_supply.dev = mmc[1].dev; rx51_vsim_supply.dev = mmc[1].dev; return 0;