From patchwork Fri Apr 1 23:41:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 682731 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 p31Neq9w005900 for ; Fri, 1 Apr 2011 23:40:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753988Ab1DAXkx (ORCPT ); Fri, 1 Apr 2011 19:40:53 -0400 Received: from na3sys009aog105.obsmtp.com ([74.125.149.75]:45757 "EHLO na3sys009aog105.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753860Ab1DAXkv (ORCPT ); Fri, 1 Apr 2011 19:40:51 -0400 Received: from source ([209.85.214.176]) (using TLSv1) by na3sys009aob105.postini.com ([74.125.148.12]) with SMTP ID DSNKTZZigzNkIHzi/6Xhp+7MQGUyyXzVo7AB@postini.com; Fri, 01 Apr 2011 16:40:51 PDT Received: by iwr19 with SMTP id 19so5680656iwr.21 for ; Fri, 01 Apr 2011 16:40:46 -0700 (PDT) Received: by 10.231.28.138 with SMTP id m10mr4770390ibc.39.1301701246092; Fri, 01 Apr 2011 16:40:46 -0700 (PDT) Received: from localhost (c-24-18-179-55.hsd1.wa.comcast.net [24.18.179.55]) by mx.google.com with ESMTPS id c1sm1759193ibe.49.2011.04.01.16.40.45 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 01 Apr 2011 16:40:45 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Subject: [PATCH/RFC 07/13] OMAP3+: VC bypass: use fields from VC struct instead of PMIC info Date: Fri, 1 Apr 2011 16:41:05 -0700 Message-Id: <1301701271-22096-8-git-send-email-khilman@ti.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1301701271-22096-1-git-send-email-khilman@ti.com> References: <1301701271-22096-1-git-send-email-khilman@ti.com> 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]); Fri, 01 Apr 2011 23:40:53 +0000 (UTC) diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c index 7829861..3fdc3fb 100644 --- a/arch/arm/mach-omap2/vc.c +++ b/arch/arm/mach-omap2/vc.c @@ -91,7 +91,6 @@ int omap_vc_bypass_scale_voltage(struct voltagedomain *voltdm, unsigned long target_volt) { struct omap_vc_channel *vc = voltdm->vc; - struct omap_vdd_info *vdd = voltdm->vdd; u32 loop_cnt = 0, retries_cnt = 0; u32 vc_valid, vc_bypass_val_reg, vc_bypass_value; u8 target_vsel, current_vsel; @@ -104,10 +103,8 @@ int omap_vc_bypass_scale_voltage(struct voltagedomain *voltdm, vc_valid = vc->common->valid; vc_bypass_val_reg = vc->common->bypass_val_reg; vc_bypass_value = (target_vsel << vc->common->data_shift) | - (vdd->pmic_info->volt_reg_addr << - vc->common->regaddr_shift) | - (vdd->pmic_info->i2c_slave_addr << - vc->common->slaveaddr_shift); + (vc->volt_reg_addr << vc->common->regaddr_shift) | + (vc->i2c_slave_addr << vc->common->slaveaddr_shift); voltdm->write(vc_bypass_value, vc_bypass_val_reg); voltdm->write(vc_bypass_value | vc_valid, vc_bypass_val_reg);