From patchwork Fri Jul 4 14:10:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 33103 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8505B203AC for ; Fri, 4 Jul 2014 14:10:54 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id i8sf5122206qcq.4 for ; Fri, 04 Jul 2014 07:10:54 -0700 (PDT) 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=c86j+ia9OzW/AoBDkmMlgtY/8PjVp6oue9wxSFbkB1w=; b=NIEGbVqbGE7pmwuRoMDuZbRLiNr2/HeY1psM8joHgqyKDZ0o3Ktb51h2h+zdU7V+oQ 08hxCXgeWZHvwRTIg9YJWmh1qWGLk22jX+YJXleU2uD15jzbWAb8IXVlt9n+/GT1VoX7 +eU4Wk3TQzhV229YQHiVVZ+VRYbAWFnQ16cbnGS6I/R1BZU79+9fXs7OIKwM9cOc9H7j UxEya+j9xeSlNzWoI5PygbPoEilzlB6r5hVmiVI5dpBS2V4/e0n41kKZYrxdwkg0sZhL 3gaKViqGS5gtZAWUADl46e/qBSv0S4mYlGN3dRrQIxfrOnmNu9Z0r0XuIkskg7BALIa8 pLtQ== X-Gm-Message-State: ALoCoQm3Qwa1avyJjut5Lv/KKZ9uBIS3CpCbH1Q3v2rj6dtUz0VO/yPW6Td8mPw/XXERDyuwY/3T X-Received: by 10.236.229.161 with SMTP id h31mr4748225yhq.21.1404483054417; Fri, 04 Jul 2014 07:10:54 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.40 with SMTP id 37ls894871qgu.23.gmail; Fri, 04 Jul 2014 07:10:54 -0700 (PDT) X-Received: by 10.220.44.20 with SMTP id y20mr52821vce.60.1404483054313; Fri, 04 Jul 2014 07:10:54 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id fi5si15536532vdb.96.2014.07.04.07.10.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Jul 2014 07:10:54 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id hy4so1634763vcb.20 for ; Fri, 04 Jul 2014 07:10:54 -0700 (PDT) X-Received: by 10.58.188.199 with SMTP id gc7mr9936248vec.4.1404483054241; Fri, 04 Jul 2014 07:10:54 -0700 (PDT) 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.221.37.5 with SMTP id tc5csp468969vcb; Fri, 4 Jul 2014 07:10:53 -0700 (PDT) X-Received: by 10.68.213.74 with SMTP id nq10mr11256513pbc.4.1404483050293; Fri, 04 Jul 2014 07:10:50 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ci1si2000775pdb.431.2014.07.04.07.10.49; Fri, 04 Jul 2014 07:10:49 -0700 (PDT) Received-SPF: none (google.com: linux-omap-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758879AbaGDOKs (ORCPT + 6 others); Fri, 4 Jul 2014 10:10:48 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:55142 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756085AbaGDOKs (ORCPT ); Fri, 4 Jul 2014 10:10:48 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s64EARDM007951; Fri, 4 Jul 2014 09:10:27 -0500 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s64EARpY028531; Fri, 4 Jul 2014 09:10:27 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Fri, 4 Jul 2014 09:10:26 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s64EA8Ep016874; Fri, 4 Jul 2014 09:10:25 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 09/10] ARM: OMAP3: PRM: move modem reset and iva2 idle to PRM driver Date: Fri, 4 Jul 2014 17:10:34 +0300 Message-ID: <1404483035-21666-10-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1404483035-21666-1-git-send-email-t-kristo@ti.com> References: <1404483035-21666-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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) 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 126f3ec..9410b4a 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -353,27 +353,12 @@ restore: #define omap3_pm_suspend NULL #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 48218a4..75dfe8e 100644 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c @@ -362,6 +362,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(); } /**