leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pxa for v3.17 v2

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTvzZuAAoJELXbXY/c+iv27qoP/R8FOuKIaTpRFvaPCZsvqOD9
 X01Y9dhIHIg5eJ1vq5BEu0qbq08xqwFMhyGKqMvPOfjqechem2gznI7DQu5+otzp
 ndrwoKMK3Nw6/32n636OoBoMPPXY37El79kJfd7S8MU8DKuU6p3Zv4DrSvo3cUr0
 FMOoz+Y2RwEiMRfhgpbH4WkZCk4L7Phh475tXjYNe5YMAPcx7fkK7CCwRgJs7upT
 chm59VtCYU85L4WHcQJYvrq6Yr68lUn3AVnwZc+iiVXkhuYWurvmg5OEZucptFuP
 isR7xgRwPR5GLXrtfAHPAFVX8cWuUaO9LDjpzMlymLfQIBdIvx+i+P5sDlSo1Wy+
 +AAS4X0caFDdEEqnSENxZcAziL0F13qnsCPdJ5uiZWK4iTLfqes8pBYEHXDv6QmW
 GfyXTGkbm+Z/F8QvX2N1LRNkBVHACHWgHXHyzZ1kJCTW5I9yMaNMeAoT1EHGM2ah
 rV5kQ215R9P0DaA2/3PCJ0odQUwF174TCplysopEFnNrimCp5HbjGjoUCeOVJtkF
 aAA0+zKl0z69Ir9P9PhOQ6zAEWDs5MV4uN+wp2ntL3Mofb3FvEdoALzA5K/z/HYX
 pqSTWGcTbj4i8qx4KQ8gyQ1i/QDJK8weCPZyloGKnlNlOt8j2bnU3qX0P9weaT2z
 xTTEIjzLqh6xtZ8TYT5P
 =u/vA
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2014-07-12 09:49:48 -07:00
commit ab70e7e7e5
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-pxa/corgi.c
View File

@ -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,
};

1
arch/arm/mach-pxa/generic.c
View File

@ -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));
}

2
arch/arm/mach-pxa/sleep.S
View File

@ -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]