From 43e2be14c111bb8d72fdd087e94ad286336056b0 Mon Sep 17 00:00:00 2001 From: Andrew Ruder Date: Thu, 5 Jun 2014 14:10:56 -0500 Subject: [PATCH 1/3] ARM: pxa: correct errata number for PXA270 Comment incorrectly cites errata 39 E39. SDIO: SDIO Devices Not Working at 19.5 Mbps Should be errata 38 E38. MEMC: Memory Controller hangs when entering Self Refresh Mode. Signed-off-by: Andrew Ruder Acked-by: Haojian Zhuang --- arch/arm/mach-pxa/sleep.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S index 1e544be9905d..6c5b3ffd2cd3 100644 --- a/arch/arm/mach-pxa/sleep.S +++ b/arch/arm/mach-pxa/sleep.S @@ -157,7 +157,7 @@ pxa_cpu_do_suspend: @ Do not reorder... @ Intel PXA270 Specification Update notes problems performing @ external accesses after SDRAM is put in self-refresh mode - @ (see Errata 39 ...hangs when entering self-refresh mode) + @ (see Errata 38 ...hangs when entering self-refresh mode) @ force address lines low by reading at physical address 0 ldr r3, [r2] From 2111667b467748ba8a3d8950e79e6921221f41eb Mon Sep 17 00:00:00 2001 From: Andrew Ruder Date: Thu, 5 Jun 2014 14:10:57 -0500 Subject: [PATCH 2/3] ARM: pxa: call debug_ll_io_init for earlyprintk This is already done automatically for many other ARM platforms by the ARM core code, but since pxa is using the .map_io callback, it needs to call it explicitely for earlyprintk support. Signed-off-by: Andrew Ruder Acked-by: Haojian Zhuang --- arch/arm/mach-pxa/generic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 42254175fcf4..94f49c23ca02 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -93,5 +93,6 @@ static struct map_desc common_io_desc[] __initdata = { void __init pxa_map_io(void) { + debug_ll_io_init(); iotable_init(ARRAY_AND_SIZE(common_io_desc)); } From 5837391bbc7ab4307abf957e6cce0b83f7f9869a Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Fri, 16 May 2014 12:40:40 +0200 Subject: [PATCH 3/3] ARM: pxa: fix typo 'CONFIG_SPI_PXA2XX_MASTER' CONFIG_SPI_PXA2XX_MASTER was used were it was surely meant to use CONFIG_SPI_PXA2XX_MODULE. Use the IS_ENABLED() macro here, as it guards against typos like this one. Signed-off-by: Paul Bolle Acked-by: Haojian Zhuang --- arch/arm/mach-pxa/corgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index 91dd1c7cdbcd..06022b235730 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c @@ -514,7 +514,7 @@ static struct pxa2xx_udc_mach_info udc_info __initdata = { .gpio_pullup = CORGI_GPIO_USB_PULLUP, }; -#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MASTER) +#if IS_ENABLED(CONFIG_SPI_PXA2XX) static struct pxa2xx_spi_master corgi_spi_info = { .num_chipselect = 3, };