Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab70e7e7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'pxa-for-v3.17-2' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 2df9ce91 5837391b

arch/arm/mach-pxa/corgi.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

arch/arm/mach-pxa/generic.c

+1 −0
Original line number Diff line number Diff line
@@ -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));

}

arch/arm/mach-pxa/sleep.S

+1 −1
Original line number Diff line number Diff line
@@ -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]