From patchwork Tue Jun 7 02:16:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 855102 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 p572FeQQ025132 for ; Tue, 7 Jun 2011 02:18:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756635Ab1FGCQS (ORCPT ); Mon, 6 Jun 2011 22:16:18 -0400 Received: from na3sys009aog114.obsmtp.com ([74.125.149.211]:43416 "EHLO na3sys009aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754812Ab1FGCQR (ORCPT ); Mon, 6 Jun 2011 22:16:17 -0400 Received: from mail-yi0-f54.google.com ([209.85.218.54]) (using TLSv1) by na3sys009aob114.postini.com ([74.125.148.12]) with SMTP ID DSNKTe2J8JeQj4ebxGGA9LeLZKulha5T6DrE@postini.com; Mon, 06 Jun 2011 19:16:17 PDT Received: by mail-yi0-f54.google.com with SMTP id 13so806912yie.27 for ; Mon, 06 Jun 2011 19:16:16 -0700 (PDT) Received: by 10.151.86.4 with SMTP id o4mr4946218ybl.339.1307412976741; Mon, 06 Jun 2011 19:16:16 -0700 (PDT) Received: from localhost (dragon.ti.com [192.94.94.33]) by mx.google.com with ESMTPS id o13sm1655234ybk.4.2011.06.06.19.16.15 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 06 Jun 2011 19:16:15 -0700 (PDT) From: Nishanth Menon To: linux-omap Cc: kevin , Nishanth Menon Subject: [pm-wip/voltdm_nm][PATCH 01/10] OMAP3+: VC: fix mutant channel handling Date: Mon, 6 Jun 2011 21:16:04 -0500 Message-Id: <1307412972-25854-2-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1307412972-25854-1-git-send-email-nm@ti.com> References: <1307412972-25854-1-git-send-email-nm@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]); Tue, 07 Jun 2011 02:18:32 +0000 (UTC) "OMAP3+: PM: VC: handle mutant channel config for OMAP4 MPU channel" handles the mutant channel flags, however since vc_cfg_bits is static file wide variable, it makes better sense to update this based on the specific channel using mutant or not. else if we have a initial registration of mutant channel definition, all other channels will end up using the mutant definition. Signed-off-by: Nishanth Menon --- we should probably squash this in to the original commit arch/arm/mach-omap2/vc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c index c8deac9..aa9f0bc 100644 --- a/arch/arm/mach-omap2/vc.c +++ b/arch/arm/mach-omap2/vc.c @@ -53,7 +53,7 @@ static struct omap_vc_channel_cfg vc_mutant_channel_cfg = { .cmd = BIT(1), }; -static struct omap_vc_channel_cfg *vc_cfg_bits = &vc_default_channel_cfg; +static struct omap_vc_channel_cfg *vc_cfg_bits; #define CFG_CHANNEL_MASK 0x1f /** @@ -300,6 +300,8 @@ void __init omap_vc_init_channel(struct voltagedomain *voltdm) vc->cfg_channel = 0; if (vc->flags & OMAP_VC_CHANNEL_CFG_MUTANT) vc_cfg_bits = &vc_mutant_channel_cfg; + else + vc_cfg_bits = &vc_default_channel_cfg; /* get PMIC/board specific settings */ vc->i2c_slave_addr = voltdm->pmic->i2c_slave_addr;