diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 20:49:48 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 20:49:48 +0400 |
| commit | ab70e7e7e5acafaaf7105c752b25b46a618951e9 (patch) | |
| tree | ba9e3d7f40b35cb0407042e7d829a0f469b509b9 | |
| parent | 2df9ce91e9418dba7fe4b12f0c9ae06650655a74 (diff) | |
| parent | 5837391bbc7ab4307abf957e6cce0b83f7f9869a (diff) | |
| download | linux-ab70e7e7e5acafaaf7105c752b25b46a618951e9.tar.xz | |
Merge tag 'pxa-for-v3.17-2' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into next/cleanup
Merge "pxa for v3.17 v2" from Haojian Zhuang:
* tag 'pxa-for-v3.17-2' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
ARM: pxa: fix typo 'CONFIG_SPI_PXA2XX_MASTER'
ARM: pxa: call debug_ll_io_init for earlyprintk
ARM: pxa: correct errata number for PXA270
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-pxa/corgi.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/generic.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/sleep.S | 2 |
3 files changed, 3 insertions, 2 deletions
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, }; 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)); } 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] |