From patchwork Thu Feb 24 11:57:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 587311 X-Patchwork-Delegate: khilman@deeprootsystems.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 p1OBwPNt008465 for ; Thu, 24 Feb 2011 11:58:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752045Ab1BXL6Y (ORCPT ); Thu, 24 Feb 2011 06:58:24 -0500 Received: from na3sys009aog111.obsmtp.com ([74.125.149.205]:54470 "EHLO na3sys009aog111.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751754Ab1BXL6X (ORCPT ); Thu, 24 Feb 2011 06:58:23 -0500 Received: from source ([209.85.161.52]) (using TLSv1) by na3sys009aob111.postini.com ([74.125.148.12]) with SMTP ID DSNKTWZH3rPkoVHUl2dJTauBQ/6YJGqKp8qF@postini.com; Thu, 24 Feb 2011 03:58:23 PST Received: by mail-fx0-f52.google.com with SMTP id 17so521987fxm.39 for ; Thu, 24 Feb 2011 03:58:22 -0800 (PST) Received: by 10.223.100.16 with SMTP id w16mr908666fan.85.1298548680070; Thu, 24 Feb 2011 03:58:00 -0800 (PST) From: Rajendra Nayak References: <20110221020231.7598.14024.stgit@twilight.localdomain> MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook 11 In-Reply-To: <20110221020231.7598.14024.stgit@twilight.localdomain> Thread-Index: AcvRbONHUa9tQ3wWT/ix2pQFMzvtiACq4Bsw X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5579 Date: Thu, 24 Feb 2011 17:27:52 +0530 Message-ID: <553cd99ec29ee91e4a4b324d0f4a0be7@mail.gmail.com> Subject: RE: [PATCH 0/3] OMAP2+: voltage: first pass at cleanup/reorganization To: Paul Walmsley , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Kevin Hilman , Nishanth Menon , Benoit Cousson , Mike Turquette 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 24 Feb 2011 11:58:33 +0000 (UTC) diff --git a/arch/arm/mach-omap2/vc44xx_data.c b/arch/arm/mach-omap2/vc44xx_data.c index 548cb06..a98da8d 100644 --- a/arch/arm/mach-omap2/vc44xx_data.c +++ b/arch/arm/mach-omap2/vc44xx_data.c @@ -30,7 +30,7 @@ * VC data common to 44xx chips * XXX This stuff presumably belongs in the vc3xxx.c or vc.c file. */ -static const struct omap_vc_common_data omap4_vc_data = { +static const struct omap_vc_common_data omap4_vc_common = { .smps_sa_reg = OMAP4_PRM_VC_SMPS_SA_OFFSET, .smps_volra_reg = OMAP4_PRM_VC_VAL_SMPS_RA_VOL_OFFSET, .bypass_val_reg = OMAP4_PRM_VC_VAL_BYPASS_OFFSET, @@ -47,6 +47,7 @@ static const struct omap_vc_common_data omap4_vc_data = { /* VC instance data for each controllable voltage line */ struct omap_vc_instance_data omap4_vc_mpu_data = { + .vc_common = &omap4_vc_common, .cmdval_reg = OMAP4_PRM_VC_VAL_CMD_VDD_MPU_L_OFFSET, .smps_sa_shift = OMAP4430_SA_VDD_MPU_L_PRM_VC_SMPS_SA_SHIFT, .smps_sa_mask = OMAP4430_SA_VDD_MPU_L_PRM_VC_SMPS_SA_MASK, @@ -55,6 +56,7 @@ struct omap_vc_instance_data omap4_vc_mpu_data = { }; struct omap_vc_instance_data omap4_vc_iva_data = { + .vc_common = &omap4_vc_common, .cmdval_reg = OMAP4_PRM_VC_VAL_CMD_VDD_IVA_L_OFFSET, .smps_sa_shift = OMAP4430_SA_VDD_IVA_L_PRM_VC_SMPS_SA_SHIFT, .smps_sa_mask = OMAP4430_SA_VDD_IVA_L_PRM_VC_SMPS_SA_MASK, @@ -63,6 +65,7 @@ struct omap_vc_instance_data omap4_vc_iva_data = { }; struct omap_vc_instance_data omap4_vc_core_data = { + .vc_common = &omap4_vc_common, .cmdval_reg = OMAP4_PRM_VC_VAL_CMD_VDD_CORE_L_OFFSET, .smps_sa_shift = OMAP4430_SA_VDD_CORE_L_0_6_SHIFT, .smps_sa_mask = OMAP4430_SA_VDD_CORE_L_0_6_MASK, diff --git a/arch/arm/mach-omap2/vp44xx_data.c b/arch/arm/mach-omap2/vp44xx_data.c index 7b26f75..65d1ad6 100644 --- a/arch/arm/mach-omap2/vp44xx_data.c +++ b/arch/arm/mach-omap2/vp44xx_data.c @@ -31,7 +31,7 @@ * VP data common to 44xx chips * XXX This stuff presumably belongs in the vp44xx.c or vp.c file. */ -static const struct omap_vp_common_data omap4_vp_data = { +static const struct omap_vp_common_data omap4_vp_common = { .vpconfig_erroroffset_shift = OMAP4430_ERROROFFSET_SHIFT, .vpconfig_errorgain_mask = OMAP4430_ERRORGAIN_MASK, .vpconfig_errorgain_shift = OMAP4430_ERRORGAIN_SHIFT, @@ -56,6 +56,7 @@ static const struct omap_vp_prm_irqst_data omap4_vp_mpu_prm_irqst_data = { }; struct omap_vp_instance_data omap4_vp_mpu_data = { + .vp_common = &omap4_vp_common, .vpconfig = OMAP4_PRM_VP_MPU_CONFIG_OFFSET, .vstepmin = OMAP4_PRM_VP_MPU_VSTEPMIN_OFFSET,