From patchwork Fri Aug 22 14:02:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 35842 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4135A2057E for ; Fri, 22 Aug 2014 14:04:03 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id w10sf80827182pde.3 for ; Fri, 22 Aug 2014 07:04:02 -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=xPNW+DnbSh2+RwPPsLfxTDBOW703aNvgrNaXEulAvxg=; b=O+CothKRNBDrrB7sAPFm2NIa9pCN000aUw46XOxZEZ+sgb4q8SadeaewvIcftcmggD P3E10I6ceeDFYrxodkDcImesGYbyuYAONCFNtSXoLyU5K3V1dATWSG/Gbl1L69skQNfk w9bswle92IGCsapSysbUgTjin3UF7xCWAvhkeEZO8XFa/opdQfSep6kDTc0bbqQnWFvr u3GdQmdKLlmuGGtR93ThzTe//fc13dusUS9XXL/j7JOAFffLjxlnZ0kQgzSLQZszuws4 PUJGp3UCUoeTHUDOkhmwP97JuepjlFU45CSbtAVj++xjq47ki9QrqAR8U0N+FO4r0lPK AJUQ== X-Gm-Message-State: ALoCoQn+GW/eEXySrGpcFKOwlW8tYVUbtdlsXXf7S5ocW/N96WIZVJ6CsiDO6DSTmul6Glz2BK5M X-Received: by 10.69.29.234 with SMTP id jz10mr3465597pbd.1.1408716242619; Fri, 22 Aug 2014 07:04:02 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.107.70 with SMTP id g64ls1186319qgf.85.gmail; Fri, 22 Aug 2014 07:04:02 -0700 (PDT) X-Received: by 10.52.141.76 with SMTP id rm12mr12111vdb.71.1408716242484; Fri, 22 Aug 2014 07:04:02 -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 hl10si13623096vdb.64.2014.08.22.07.04.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Aug 2014 07:04:02 -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 ik5so12108109vcb.6 for ; Fri, 22 Aug 2014 07:04:02 -0700 (PDT) X-Received: by 10.52.69.172 with SMTP id f12mr1647175vdu.9.1408716242316; Fri, 22 Aug 2014 07:04:02 -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.45.67 with SMTP id uj3csp19582vcb; Fri, 22 Aug 2014 07:04:01 -0700 (PDT) X-Received: by 10.70.103.204 with SMTP id fy12mr6674948pdb.144.1408716241416; Fri, 22 Aug 2014 07:04:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dt2si41012675pdb.136.2014.08.22.07.04.00 for ; Fri, 22 Aug 2014 07:04:00 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S932544AbaHVODw (ORCPT + 21 others); Fri, 22 Aug 2014 10:03:52 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:34012 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932451AbaHVODD (ORCPT ); Fri, 22 Aug 2014 10:03:03 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s7ME2a4h002082; Fri, 22 Aug 2014 09:02:36 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s7ME2at0024164; Fri, 22 Aug 2014 09:02:36 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Fri, 22 Aug 2014 09:02:35 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s7ME2Zq9026070; Fri, 22 Aug 2014 09:02:35 -0500 From: Nishanth Menon To: Santosh Shilimkar , Tony Lindgren , Tero Kristo , Paul Walmsley CC: Kevin Hilman , , , , Keerthy , =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Nishanth Menon Subject: [PATCH 09/10] ARM: OMAP5: Add hook in SoC initcalls to enable pm initialization Date: Fri, 22 Aug 2014 09:02:33 -0500 Message-ID: <1408716154-26101-10-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1408716154-26101-1-git-send-email-nm@ti.com> References: <1408716154-26101-1-git-send-email-nm@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: nm@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: , From: Santosh Shilimkar With consolidated code, now we can add the required hooks for OMAP5 to enable power management. Signed-off-by: Santosh Shilimkar [nm@ti.com: minor rebase updates] Signed-off-by: Nishanth Menon --- /home/nmenon/tmp/upstream/v3.17/cpuidle-suspend-support/0009-ARM-OMAP5-Add-hook-in-SoC-initcalls-to-enable-pm-ini.patch arch/arm/mach-omap2/common.h | 2 +- arch/arm/mach-omap2/io.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index dc571f1..5bb1592 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -60,7 +60,7 @@ static inline int omap3_pm_init(void) } #endif -#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP4) +#if defined(CONFIG_PM) && (defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)) int omap4_pm_init(void); int omap4_pm_init_early(void); #else diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 5d0667c..2890c2d 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -667,6 +667,7 @@ void __init omap5_init_early(void) omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_AON_BASE), OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE)); omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE)); + omap4_pm_init_early(); omap_prm_base_init(); omap_cm_base_init(); omap44xx_prm_init(); @@ -682,6 +683,8 @@ void __init omap5_init_early(void) void __init omap5_init_late(void) { omap_common_late_init(); + omap4_pm_init(); + omap2_clk_enable_autoidle_all(); } #endif