From patchwork Wed Sep 9 21:18:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 53353 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 8C0AA22B05 for ; Wed, 9 Sep 2015 21:19:35 +0000 (UTC) Received: by lbbmp1 with SMTP id mp1sf7689171lbb.2 for ; Wed, 09 Sep 2015 14:19:34 -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:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=SqWKnLccSqAfe1m58DgrtMCeaR+At3iqjT5gxTuj7L8=; b=ekxwEDLTlUI+zmYNPC5mIln12vdsFsBAgQc2QBiXNa4rirfEkVIaiYrjD6LTqw6rS+ uqJiresa3KFWEwKUG8Inh39PJ+onLe2Cp96yxb7VwYP/jm9thRt74miVznqAPLUh4heL tO3V16SS/xbsjvsj3O8Jp1E6NtGGH3p1GwZw01rIiHWe0QWN5XWfrCgWJwN0Y/LhYaob nRb11IwblJWTYX0SZqerCHATKyOwGms377U96oEngpKqgog+fjdcVj30T1KmM0OOd1N5 n2MAOY+ENkcfZpRCLYaXt0fXHjXOVw6gUhfEKByr7lX7Me0hkAvKxE9f5ZkN0RGX8gfE WwKg== X-Gm-Message-State: ALoCoQm7ksL1yFvaNvuRcNCd4bloFb5QlpOKuQpZkVbTd35cTSELgw5+HQpYIpQwREBpg4rnMczX X-Received: by 10.112.189.105 with SMTP id gh9mr8778272lbc.16.1441833574307; Wed, 09 Sep 2015 14:19:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.242.163 with SMTP id wr3ls100629lac.105.gmail; Wed, 09 Sep 2015 14:19:34 -0700 (PDT) X-Received: by 10.112.83.136 with SMTP id q8mr8995692lby.93.1441833574118; Wed, 09 Sep 2015 14:19:34 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id ao2si7940260lac.69.2015.09.09.14.19.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Sep 2015 14:19:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbcjc2 with SMTP id jc2so13018124lbc.0 for ; Wed, 09 Sep 2015 14:19:34 -0700 (PDT) X-Received: by 10.112.168.100 with SMTP id zv4mr31073919lbb.117.1441833574013; Wed, 09 Sep 2015 14:19:34 -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.112.59.35 with SMTP id w3csp563200lbq; Wed, 9 Sep 2015 14:19:33 -0700 (PDT) X-Received: by 10.50.143.2 with SMTP id sa2mr14142411igb.89.1441833572986; Wed, 09 Sep 2015 14:19:32 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s5si13592239pdd.226.2015.09.09.14.19.32; Wed, 09 Sep 2015 14:19:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 S1755827AbbIIVTa (ORCPT + 28 others); Wed, 9 Sep 2015 17:19:30 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:44481 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753834AbbIIVSp (ORCPT ); Wed, 9 Sep 2015 17:18:45 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id t89LIIQ2026063; Wed, 9 Sep 2015 16:18:18 -0500 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 t89LIIXs002029; Wed, 9 Sep 2015 16:18:18 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.224.2; Wed, 9 Sep 2015 16:18:10 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t89LIIs9014720; Wed, 9 Sep 2015 16:18:18 -0500 From: Nishanth Menon To: Kevin Hilman , Tony Lindgren CC: , , , Nishanth Menon Subject: [PATCH 1/4] ARM: OMAP4+: PM: erratum is used by OMAP5 and DRA7 as well Date: Wed, 9 Sep 2015 16:18:11 -0500 Message-ID: <1441833494-32450-2-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1441833494-32450-1-git-send-email-nm@ti.com> References: <1441833494-32450-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.217.180 as permitted sender) smtp.mailfrom=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: , OMAP5 and DRA7 reuse the same pm44xx_erratum variable so, enable the same, else PM features such as Suspend to ram is broken in a SoC only build configuration. Reported-by: Carlos Hernandez Signed-off-by: Nishanth Menon --- arch/arm/mach-omap2/pm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 425bfcd67db6..f5bae699baac 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h @@ -103,7 +103,8 @@ static inline void enable_omap3630_toggle_l2_on_restore(void) { } #define PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD (1 << 0) #define PM_OMAP4_CPU_OSWR_DISABLE (1 << 1) -#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP4) +#if defined(CONFIG_PM) && (defined(CONFIG_ARCH_OMAP4) ||\ + defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)) extern u16 pm44xx_errata; #define IS_PM44XX_ERRATUM(id) (pm44xx_errata & (id)) #else