Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1244701

[PATCH] ARM: pxa: fix pxa3xx DFI lockup hack

Show all headers | View raw

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 <arnd@arndb.de>
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;
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Arnd Bergmann <arnd@arndb.de> - 2015-10-12 15:50 +0200
  [PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode Arnd Bergmann <arnd@arndb.de> - 2015-10-12 15:50 +0200
    Re: [PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode Robert Jarzmik <robert.jarzmik@free.fr> - 2015-10-12 19:20 +0200
      Re: [PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode Robert Jarzmik <robert.jarzmik@free.fr> - 2015-10-12 21:00 +0200
        Re: [PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode Arnd Bergmann <arnd@arndb.de> - 2015-10-12 21:30 +0200
          Re: [PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode Robert Jarzmik <robert.jarzmik@free.fr> - 2015-10-12 23:20 +0200
            Re: [PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode Arnd Bergmann <arnd@arndb.de> - 2015-10-13 10:00 +0200
      Re: [PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode Arnd Bergmann <arnd@arndb.de> - 2015-10-12 21:00 +0200
  Re: [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Robert Jarzmik <robert.jarzmik@free.fr> - 2015-10-12 19:10 +0200
    Re: [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Arnd Bergmann <arnd@arndb.de> - 2015-10-12 21:00 +0200
    Re: [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Arnd Bergmann <arnd@arndb.de> - 2015-10-14 17:20 +0200
      Re: [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Robert Jarzmik <robert.jarzmik@free.fr> - 2015-10-14 21:20 +0200

csiph-web