From patchwork Fri Mar 12 04:48:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 85197 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2C4mljX027231 for ; Fri, 12 Mar 2010 04:49:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755476Ab0CLEtH (ORCPT ); Thu, 11 Mar 2010 23:49:07 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:40198 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753926Ab0CLEtF convert rfc822-to-8bit (ORCPT ); Thu, 11 Mar 2010 23:49:05 -0500 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o2C4mj3A001844 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 11 Mar 2010 22:48:47 -0600 Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id o2C4mhLC017540; Fri, 12 Mar 2010 10:18:44 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde70.ent.ti.com ([172.24.170.148]) with mapi; Fri, 12 Mar 2010 10:18:43 +0530 From: "Hiremath, Vaibhav" To: Tony Lindgren , "linux-arm-kernel@lists.infradead.org" CC: Tomi Valkeinen , "linux-omap@vger.kernel.org" Date: Fri, 12 Mar 2010 10:18:40 +0530 Subject: RE: [PATCH 17/19] omap: Add DSI regulator supply to OMAP3EVM board file Thread-Topic: [PATCH 17/19] omap: Add DSI regulator supply to OMAP3EVM board file Thread-Index: AcrBdTUzr8Fkum4TT7q5Qd3N1st2gQAIiEtw Message-ID: <19F8576C6E063C45BE387C64729E7394044DD32D7B@dbde02.ent.ti.com> References: <20100311234404.4500.82861.stgit@baageli.muru.com> <20100311234847.4500.24584.stgit@baageli.muru.com> In-Reply-To: <20100311234847.4500.24584.stgit@baageli.muru.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 12 Mar 2010 04:49:07 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index ea1014b..f5c815a 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -514,10 +514,8 @@ static struct regulator_init_data omap3_evm_vdac = { }; /* VPLL2 for digital video outputs */ -static struct regulator_consumer_supply omap3_evm_vpll2_supply = { - .supply = "vdds_dsi", - .dev = &omap3_evm_dss_device.dev, -}; +static struct regulator_consumer_supply omap3_evm_vpll2_supply = + REGULATOR_SUPPLY("vdds_dsi", "omapdss"); static struct regulator_init_data omap3_evm_vpll2 = { .constraints = { [Hiremath, Vaibhav] Since you have already merged the patch , I have created patch on top of linux-omap/master below. diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index a05de10..f5c815a 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -514,16 +514,8 @@ static struct regulator_init_data omap3_evm_vdac = { }; /* VPLL2 for digital video outputs */ -static struct regulator_consumer_supply omap3_evm_vpll2_supplies[] = { - { - .supply = "vdvi", - .dev = &omap3_evm_lcd_device.dev, - }, - { - .supply = "vdds_dsi", - .dev = &omap3_evm_dss_device.dev, - }, -}; +static struct regulator_consumer_supply omap3_evm_vpll2_supply = + REGULATOR_SUPPLY("vdds_dsi", "omapdss"); static struct regulator_init_data omap3_evm_vpll2 = { .constraints = { @@ -536,8 +528,8 @@ static struct regulator_init_data omap3_evm_vpll2 = { .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, - .num_consumer_supplies = ARRAY_SIZE(omap3_evm_vpll2_supplies), - .consumer_supplies = omap3_evm_vpll2_supplies, + .num_consumer_supplies = 1, + .consumer_supplies = &omap3_evm_vpll2_supply, }; static struct twl4030_platform_data omap3evm_twldata = {