From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752709AbbJLNtR (ORCPT ); Mon, 12 Oct 2015 09:49:17 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:54528 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751796AbbJLNtQ (ORCPT ); Mon, 12 Oct 2015 09:49:16 -0400 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Date: Mon, 12 Oct 2015 15:44:49 +0200 Message-ID: <5287252.pkh9x0t1Y6@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:uma3aFWnPO9HrVJBoY1QAWDmFhAWEdJdofCM/ANLJr2gPYJdYj6 rZ5pBoPHbmWBl8B1P9NCvb9BCiDst8PZexKcmZZZf08Hde+gFqnb2qjiedOwtF7DWHV5zhH 4RjZaaVdLWPICnQWC5zdKyEiUOPJ8E9+qnUU7vTs0V86sDnB2XuJwIWrgk/WBe8TVGR8UGY RL057F5YWMt+7P6tWgAkA== X-UI-Out-Filterresults: notjunk:1;V01:K0:V1Qd7dTImnA=:fAJPHoNOONekj07Sz1KGLQ 1xM7lZV4Qo39eYh+SpNv9G3GGbwIXl1GfVBE8jCEUnp40N49E9uIr1RFen85JNl40tAbPzjdL sbr703SzFdyjnq3M0hCan1sgbtTHdmqYy+v6TN2GDvflnoVTJ+KF+NQeKPds9ebprXdMCK4ui CheZ5o72+Uj0N7SjkXlRnIzJGsyW7aaHXC6ZOCJQI2buWdNSVJWJbtJ0tJrZd3ue1B/EsDRxC 6EtifkdmO2STYMMZNmHlPiaBS4IkRVOXIcMzz1QF/7veq8vA8QJAEEjA+f5/10nSkVginQQL8 8cfvlMscsKvqwWBeA/8gbr/tKzm6mQCewuimWYOwcZb+qUIPipDOsjlxjShQmefzFYOY6axRI PrybXUkRNxgSBB9PzqpRPVBdM9rQnUkMFzYZP7kICTzJF4ouqPX3DWr1U9YdP+hX75qrecUwa VY4UdB7ny5ci6eo0Dm5grFukbpSAVYtFlWMZvVei4bxWlAX2dw67BmaiJcQp6FbtCs48Ku5d1 6X/3XEhKRr5pWJgKeJ7TUDxRUN8XUY6jnGXhp+pqSpJoRc43CphHv9XOp6zzQzoD/uyF1KP7Q UDoo7iNZV8W+oDA/SU0yN7hLwxr2XstOjaPHZpc5hNnMGhSMudcH2Kndd0HtN7wg3tGCi+61P aZqlyxTAq7AJlYO9s18UpWHwpp5sJu2T5oGe9BPlH99KvwjYs2XSIkeVaIp0Yeb4SV8xhE4ws T6L8reoD3fyzbotU Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some recently added code to avoid a bug introduced a build error when CONFIG_PM is disabled and a macro is hidden: arch/arm/mach-pxa/pxa3xx.c: In function 'pxa3xx_init': arch/arm/mach-pxa/pxa3xx.c:439:3: error: 'NDCR' undeclared (first use in this function) NDCR = (NDCR & ~NDCR_ND_ARB_EN) | NDCR_ND_ARB_CNTL; ^ This moves the macro outside of the #ifdef so it can be referenced correctly. Signed-off-by: Arnd Bergmann Fixes: adf3442cc890 ("ARM: pxa: fix DFI bus lockups on startup") --- We merged the patch that introduced this as a fix for 4.3, so we should probably add this one too. diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 06005d3f2ba3..20ce2d386f17 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -42,10 +42,6 @@ #define PECR_IS(n) ((1 << ((n) * 2)) << 29) extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int)); -#ifdef CONFIG_PM - -#define ISRAM_START 0x5c000000 -#define ISRAM_SIZE SZ_256K /* * NAND NFC: DFI bus arbitration subset @@ -54,6 +50,11 @@ extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int)); #define NDCR_ND_ARB_EN (1 << 12) #define NDCR_ND_ARB_CNTL (1 << 19) +#ifdef CONFIG_PM + +#define ISRAM_START 0x5c000000 +#define ISRAM_SIZE SZ_256K + static void __iomem *sram; static unsigned long wakeup_src;