From patchwork Fri Jul 4 14:10:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 33099 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0D973203AC for ; Fri, 4 Jul 2014 14:10:49 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id fp1sf9708023pdb.8 for ; Fri, 04 Jul 2014 07:10:49 -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=0K7qxbvaUqU4bYaiIzZ5AgsQ5FNPkgf0GCnsOJ6GaKw=; b=gH43kH1LcikLb3QEFN6McGm4Es6wGVQ2rg2eQwW1lgAbHDiiIUiclbsuOJoXim8CbI j0wje+Lz1vzMxOzW3SUmfIBIrFuCXBq1LFA62E0IkJCeete+ENsVlQjBdfDVAQ818jHT JnfR5OT/0ZMt6BWeq59usQc7YSLtbIEQete5pLmziH6h8YR32hTxfLpphsqKnvT/D9se uyfYJjz1lRUebm/gE2mXgCcFBm6N4Z7oxdlcA9CUHm7uDYri0hvaMVYXXW3yPz0LXxQv vj6kwC86Jm4O/hHFyHLRXoLywGX04qFPt70rVeCvHpjQkHsxWkIUOYL4MM/JQA47RfYj u+8Q== X-Gm-Message-State: ALoCoQljtoaeTeQY1rOO1odq6rCIuxjyGpGcdc7I6GDFCTt1aGOzGdW5xvCwwdNOHv67eX8MU7rv X-Received: by 10.66.145.33 with SMTP id sr1mr5492748pab.18.1404483049168; Fri, 04 Jul 2014 07:10:49 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.80.114 with SMTP id b105ls920877qgd.16.gmail; Fri, 04 Jul 2014 07:10:49 -0700 (PDT) X-Received: by 10.58.207.33 with SMTP id lt1mr109327vec.63.1404483049005; Fri, 04 Jul 2014 07:10:49 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id dr2si15532961vdb.78.2014.07.04.07.10.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Jul 2014 07:10:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id im17so1607640vcb.25 for ; Fri, 04 Jul 2014 07:10:48 -0700 (PDT) X-Received: by 10.58.112.65 with SMTP id io1mr286562veb.61.1404483048923; Fri, 04 Jul 2014 07:10:48 -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 tc5csp468955vcb; Fri, 4 Jul 2014 07:10:48 -0700 (PDT) X-Received: by 10.68.194.202 with SMTP id hy10mr11128590pbc.94.1404483045905; Fri, 04 Jul 2014 07:10:45 -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.45; Fri, 04 Jul 2014 07:10:45 -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 S1758708AbaGDOKn (ORCPT + 6 others); Fri, 4 Jul 2014 10:10:43 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:52125 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758631AbaGDOKl (ORCPT ); Fri, 4 Jul 2014 10:10:41 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s64EAGZX012442; Fri, 4 Jul 2014 09:10:16 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s64EAGvQ028446; Fri, 4 Jul 2014 09:10:16 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Fri, 4 Jul 2014 09:10:16 -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 s64EA8Ej016874; Fri, 4 Jul 2014 09:10:15 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 03/10] ARM: OMAP3: PRM: move modem reset to PRM driver Date: Fri, 4 Jul 2014 17:10:28 +0300 Message-ID: <1404483035-21666-4-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.180 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: , This is a more proper isolation of the code. Done in preparation of making PRM an individual driver. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/pm34xx.c | 5 +---- arch/arm/mach-omap2/prm3xxx.c | 15 +++++++++++++++ arch/arm/mach-omap2/prm3xxx.h | 1 + 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 6d02573..acb895d 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -371,10 +371,7 @@ static void __init omap3_d2d_idle(void) omap_ctrl_writew(padconf, OMAP3_PADCONF_SAD2D_IDLEACK); /* reset modem */ - omap2_prm_write_mod_reg(OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RSTPWRON_MASK | - OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RST_MASK, - CORE_MOD, OMAP2_RM_RSTCTRL); - omap2_prm_write_mod_reg(0, CORE_MOD, OMAP2_RM_RSTCTRL); + omap3_prm_reset_modem(); } static void __init prcm_setup_regs(void) diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c index a575b69..e46ff71 100644 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c @@ -260,6 +260,21 @@ int omap3xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 ignore_bits) } /** + * omap3_prm_reset_modem - toggle reset signal for modem + * + * Toggles the reset signal to modem IP block. Required to allow + * OMAP3430 without stacked modem to idle properly. + */ +void __init omap3_prm_reset_modem(void) +{ + omap2_prm_write_mod_reg( + OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RSTPWRON_MASK | + OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RST_MASK, + CORE_MOD, OMAP2_RM_RSTCTRL); + omap2_prm_write_mod_reg(0, CORE_MOD, OMAP2_RM_RSTCTRL); +} + +/** * omap3xxx_prm_reconfigure_io_chain - clear latches and reconfigure I/O chain * * Clear any previously-latched I/O wakeup events and ensure that the diff --git a/arch/arm/mach-omap2/prm3xxx.h b/arch/arm/mach-omap2/prm3xxx.h index 007ff59..21eb1d5 100644 --- a/arch/arm/mach-omap2/prm3xxx.h +++ b/arch/arm/mach-omap2/prm3xxx.h @@ -164,6 +164,7 @@ extern int __init omap3xxx_prm_init(void); extern u32 omap3xxx_prm_get_reset_sources(void); int omap3xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 ignore_bits); void omap3xxx_prm_iva_idle(void); +void omap3_prm_reset_modem(void); #endif /* __ASSEMBLER */