From patchwork Thu Oct 8 11:58:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 52502 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 n98C82v4007869 for ; Thu, 8 Oct 2009 12:08:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757896AbZJHMBR (ORCPT ); Thu, 8 Oct 2009 08:01:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757855AbZJHMBO (ORCPT ); Thu, 8 Oct 2009 08:01:14 -0400 Received: from smtp.nokia.com ([192.100.122.233]:45220 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757827AbZJHMBJ (ORCPT ); Thu, 8 Oct 2009 08:01:09 -0400 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n98BxGih014061; Thu, 8 Oct 2009 14:59:37 +0300 Received: from vaebh102.NOE.Nokia.com ([10.160.244.23]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 8 Oct 2009 14:59:28 +0300 Received: from vaebe101.NOE.Nokia.com ([10.160.244.11]) by vaebh102.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 6/8] RX-51: Audio: Add usage of regulator framework to control VMMC2 Date: Thu, 8 Oct 2009 14:58:55 +0300 Message-Id: <1255003137-1034-7-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.0870 (UTC) FILETIME=[C95F79E0: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 92f7dfa..9177b1c 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -129,8 +129,9 @@ static struct regulator_consumer_supply rx51_vaux3_supply = { .supply = "vmmc", }; -static struct regulator_consumer_supply rx51_vmmc2_supply = { - .supply = "vmmc", +static struct regulator_consumer_supply rx51_vmmc2_supplies[] = { + REGULATOR_SUPPLY("avdd_dac", "2-0018"), /* tlv320aic3x */ + REGULATOR_SUPPLY("vdd", "2-0060"), /* tpa6130a2*/ }; static struct regulator_consumer_supply rx51_vsim_supply = { @@ -230,8 +231,8 @@ static struct regulator_init_data rx51_vmmc2 = { | REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, - .num_consumer_supplies = 1, - .consumer_supplies = &rx51_vmmc2_supply, + .num_consumer_supplies = ARRAY_SIZE(rx51_vmmc2_supplies), + .consumer_supplies = rx51_vmmc2_supplies, }; static struct regulator_init_data rx51_vsim = { @@ -442,10 +443,9 @@ static int __init rx51_i2c_init(void) if ((system_rev >= SYSTEM_REV_S_USES_VAUX3 && system_rev < 0x100) || system_rev >= SYSTEM_REV_B_USES_VAUX3) rx51_twldata.vaux3 = &rx51_vaux3_mmc; - else { + else rx51_twldata.vaux3 = &rx51_vaux3_cam; - rx51_twldata.vmmc2 = &rx51_vmmc2; - } + rx51_twldata.vmmc2 = &rx51_vmmc2; omap_register_i2c_bus(1, 2600, rx51_peripherals_i2c_board_info_1, ARRAY_SIZE(rx51_peripherals_i2c_board_info_1)); omap_register_i2c_bus(2, 100, NULL, 0);