From patchwork Thu Nov 15 00:54:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1744651 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 58F39DF264 for ; Thu, 15 Nov 2012 00:56:39 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TYnj2-000398-6s; Thu, 15 Nov 2012 00:54:36 +0000 Received: from mail-da0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TYniy-00038p-SP for linux-arm-kernel@lists.infradead.org; Thu, 15 Nov 2012 00:54:33 +0000 Received: by mail-da0-f49.google.com with SMTP id q27so399749daj.36 for ; Wed, 14 Nov 2012 16:54:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=Ye9gn5QlacNEt+/nN/ACgH/UnVbhcsnbkCMrdPDHivg=; b=X78MtM07kwO+e7vRNUk1UZ7nr4W63oXntvSXJTrVNmz1Qopuky0N7FuPyq6frDB3S3 bahvSIs4MNF8eD5YhGPC6HTKkgJtBsbK7L7MHaxvzjuQfJ3v/ZpiRp0cYuSSeKyU8Wgr +96WkopqA0hyAyJkW6Nhrm8EwPPK3e441bre1K16qi/o1Oa+FR6vVwPH7KypcBo08ETU ckhawhlyQpeSH3pKJpkGz+qowIsrdEDpiGJ1A+J+YfUZpWnHjRLlc10MyxRtYfiowsam diwADRX61tRFBowd5SuCoYieiL/LWUCjbfsKEGdmL8z0OgYHSCG99h6YNdZPO7sbeWUz k8Bg== Received: by 10.68.248.10 with SMTP id yi10mr76596545pbc.39.1352940870244; Wed, 14 Nov 2012 16:54:30 -0800 (PST) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id ve6sm8533611pbc.58.2012.11.14.16.54.28 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Nov 2012 16:54:29 -0800 (PST) From: Kevin Hilman To: Tony Lindgren , linux-omap@vger.kernel.org Subject: [PATCH] ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n Date: Wed, 14 Nov 2012 16:54:27 -0800 Message-Id: <1352940867-8806-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.8.0 X-Gm-Message-State: ALoCoQnfbAS8IbdR5sUDio2s2EIyk8Icr//rxHzTNKly4x836hwVFMXBN7hzJe0giw0afyPGZDCh X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121114_195433_039669_7F61ECC9 X-CRM114-Status: GOOD ( 12.60 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Tero Kristo , Santosh Shilimkar , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Kevin Hilman commit c9621844 (ARM: OMAP4: PM: add errata support) introduced errata handling for OMAP4, but was broken when CONFIG_PM=n. When CONFIG_PM=n, pm44xx.c is not compiled, yet that is where pm44xx_errata is defined. However, these errata are needed for the SMP boot/hotplug case also, and are primarily used in omap-smp.c. Move the definition of pm44xx_errata to omap-smp.c so that it's available even in the CONFIG_PM=n case. Cc: Tero Kristo Signed-off-by: Kevin Hilman --- This patch applies on top of Tony's fixes-non-critical-part-2. The bug was introduced in my for_3.8-fixes-pm tag (now included in Tony's fixes-non-critical-part2.) arch/arm/mach-omap2/omap-smp.c | 2 ++ arch/arm/mach-omap2/pm44xx.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index 49a08df..cd42d92 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c @@ -40,6 +40,8 @@ #define OMAP5_CORE_COUNT 0x2 +u16 pm44xx_errata; + /* SCU base address */ static void __iomem *scu_base; diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index 0adbd7d..04922d1 100644 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c @@ -34,7 +34,6 @@ struct power_state { }; static LIST_HEAD(pwrst_list); -u16 pm44xx_errata; #ifdef CONFIG_SUSPEND static int omap4_pm_suspend(void)