From patchwork Tue Mar 4 16:19:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 25706 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 626402066C for ; Tue, 4 Mar 2014 16:20:44 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id hq11sf11987526vcb.0 for ; Tue, 04 Mar 2014 08:20:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=YaUQXoWxeHulF617hV9HWN7INJZkdUdtcTXxm+G+FU4=; b=Vvlnwwcg9rhORjGiueAr1E2QEgQe7t7i65SjzdaSI44GCehoo2E7h97STETYC54pYA MIevXvvKqTm9S8uMF/fzTvO4F5Rpn+cNLIEWOwml/g2O5fCiRn3hjASfwhLUdl9g6epz 2msgBWkeNnXOxfJmPJvKD0fAldfb+XdazN+SnMHKZWYn+pq/XH5L7eQymDtgxo+boz43 CwfK3Hxlrar5fGjRB6BN7ob8T/PIMtNPQuLacHXsqHqQQJUk8+AaQ1HJvj4RhkxkVdHR xMQ2cxTvsgEyuf6iSevc52TP/zNHeOolIVTIRB5GDrq83YdlFPe6Wy5N4GOG9VbrVzwS RbmQ== X-Gm-Message-State: ALoCoQmBSYkaURAJzLTb6AAKXeEGk1LGau7R0pwmzmprB0YWyiD93m2p44vlxpKDgU1YBpr8ms0c X-Received: by 10.236.81.136 with SMTP id m8mr191166yhe.14.1393950044163; Tue, 04 Mar 2014 08:20:44 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.43.119 with SMTP id d110ls2543873qga.32.gmail; Tue, 04 Mar 2014 08:20:44 -0800 (PST) X-Received: by 10.220.159.4 with SMTP id h4mr190627vcx.1.1393950044064; Tue, 04 Mar 2014 08:20:44 -0800 (PST) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id eb8si4684488vdb.112.2014.03.04.08.20.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 08:20:44 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id jz11so5890787veb.39 for ; Tue, 04 Mar 2014 08:20:44 -0800 (PST) X-Received: by 10.52.171.68 with SMTP id as4mr229488vdc.0.1393950043974; Tue, 04 Mar 2014 08:20:43 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.130.193 with SMTP id u1csp138089vcs; Tue, 4 Mar 2014 08:20:43 -0800 (PST) X-Received: by 10.68.52.132 with SMTP id t4mr507540pbo.102.1393950043045; Tue, 04 Mar 2014 08:20:43 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wq4si14758274pbc.137.2014.03.04.08.20.42; Tue, 04 Mar 2014 08:20:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754615AbaCDQUl (ORCPT + 5 others); Tue, 4 Mar 2014 11:20:41 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:35175 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972AbaCDQUk (ORCPT ); Tue, 4 Mar 2014 11:20:40 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s24GKFRN026567; Tue, 4 Mar 2014 10:20:15 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s24GKFok000623; Tue, 4 Mar 2014 10:20:15 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Tue, 4 Mar 2014 10:20:15 -0600 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s24GJdRG017797; Tue, 4 Mar 2014 10:20:13 -0600 From: Tero Kristo To: , , , CC: Subject: [PATCH 17/18] ARM: OMAP3: PRM: move modem reset and iva2 idle to PRM driver Date: Tue, 4 Mar 2014 18:19:17 +0200 Message-ID: <1393949958-816-18-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393949958-816-1-git-send-email-t-kristo@ti.com> References: <1393949958-816-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: t-kristo@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Done in preparation to move PRM into its own driver. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/pm34xx.c | 15 --------------- arch/arm/mach-omap2/prm3xxx.c | 7 +++++++ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 8df2d65..faa2c05 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -346,27 +346,12 @@ restore: #endif /* CONFIG_SUSPEND */ -static void __init omap3_d2d_idle(void) -{ - omap3_ctrl_setup_d2d_padconf(); - - /* reset modem */ - omap3_prm_reset_modem(); -} - static void __init prcm_setup_regs(void) { /* XXX This should be handled by hwmod code or SCM init code */ omap_ctrl_writel(OMAP3430_AUTOIDLE_MASK, OMAP2_CONTROL_SYSCONFIG); omap3_prm_init_pm(cpu_is_omap3630(), omap3_has_iva()); - - /* - * We need to idle iva2_pwrdm even on am3703 with no iva2. - */ - omap3xxx_prm_iva_idle(); - - omap3_d2d_idle(); } void omap3_pm_off_mode_enable(int enable) diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c index eb37970..239163f 100644 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c @@ -361,6 +361,13 @@ void __init omap3_prm_init_pm(bool has_uart4, bool has_iva) /* Clear any pending PRCM interrupts */ omap2_prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET); + + /* We need to idle iva2_pwrdm even on am3703 with no iva2. */ + omap3xxx_prm_iva_idle(); + + omap3_ctrl_setup_d2d_padconf(); + + omap3_prm_reset_modem(); } /**