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

Commit 4f4669ee authored by Russell King's avatar Russell King
Browse files

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

parents 48edcfcf e3396b26

arch/arm/common/locomo.c

+5 −5
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int locomo_suspend(struct platform_device *dev, pm_message_t state) 
	save->LCM_GPO     = locomo_readl(lchip->base + LOCOMO_GPO);	/* GPIO */

	locomo_writel(0x00, lchip->base + LOCOMO_GPO);

	save->LCM_SPICT   = locomo_readl(lchip->base + LOCOMO_SPI + LOCOMO_SPICT);	/* SPI */

	locomo_writel(0x40, lchip->base + LOCOMO_SPICT);

	locomo_writel(0x40, lchip->base + LOCOMO_SPI + LOCOMO_SPICT);

	save->LCM_GPE     = locomo_readl(lchip->base + LOCOMO_GPE);	/* GPIO */

	locomo_writel(0x00, lchip->base + LOCOMO_GPE);

	save->LCM_ASD     = locomo_readl(lchip->base + LOCOMO_ASD);	/* ADSTART */
@@ -418,7 +418,7 @@ __locomo_probe(struct device *me, struct resource *mem, int irq) 
	/* Longtime timer */

	locomo_writel(0, lchip->base + LOCOMO_LTINT);

	/* SPI */

	locomo_writel(0, lchip->base + LOCOMO_SPIIE);

	locomo_writel(0, lchip->base + LOCOMO_SPI + LOCOMO_SPIIE);



	locomo_writel(6 + 8 + 320 + 30 - 10, lchip->base + LOCOMO_ASD);

	r = locomo_readl(lchip->base + LOCOMO_ASD);
@@ -707,7 +707,7 @@ void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int 
	udelay(DAC_SCL_HIGH_HOLD_TIME);	/* 4.7 usec */

	if (locomo_readl(mapbase + LOCOMO_DAC) & LOCOMO_DAC_SDAOEB) {	/* High is error */

		printk(KERN_WARNING "locomo: m62332_senddata Error 1\n");

		return;

		goto out;

	}



	/* Send Sub address (LSB is channel select) */
@@ -735,7 +735,7 @@ void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int 
	udelay(DAC_SCL_HIGH_HOLD_TIME);	/* 4.7 usec */

	if (locomo_readl(mapbase + LOCOMO_DAC) & LOCOMO_DAC_SDAOEB) {	/* High is error */

		printk(KERN_WARNING "locomo: m62332_senddata Error 2\n");

		return;

		goto out;

	}



	/* Send DAC data */
@@ -760,9 +760,9 @@ void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int 
	udelay(DAC_SCL_HIGH_HOLD_TIME);	/* 4.7 usec */

	if (locomo_readl(mapbase + LOCOMO_DAC) & LOCOMO_DAC_SDAOEB) {	/* High is error */

		printk(KERN_WARNING "locomo: m62332_senddata Error 3\n");

		return;

	}



out:

	/* stop */

	r = locomo_readl(mapbase + LOCOMO_DAC);

	r &=  ~(LOCOMO_DAC_SCLOEB);

arch/arm/mach-mmp/include/mach/uncompress.h

+4 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#define UART2_BASE	(APB_PHYS_BASE + 0x17000)

#define UART3_BASE	(APB_PHYS_BASE + 0x18000)



static volatile unsigned long *UART = (unsigned long *)UART2_BASE;

static volatile unsigned long *UART;



static inline void putc(char c)

{
@@ -37,6 +37,9 @@ static inline void flush(void) 


static inline void arch_decomp_setup(void)

{

	/* default to UART2 */

	UART = (unsigned long *)UART2_BASE;



	if (machine_is_avengers_lite())

		UART = (unsigned long *)UART3_BASE;

}

arch/arm/mach-pxa/Kconfig

+7 −4
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ config MACH_H5000 
config MACH_HIMALAYA

	bool "HTC Himalaya Support"

	select CPU_PXA26x

	select FB_W100



config MACH_MAGICIAN

	bool "Enable HTC Magician Support"
@@ -454,6 +453,13 @@ config PXA_SHARPSL 
config SHARPSL_PM

	bool

	select APM_EMULATION

	select SHARPSL_PM_MAX1111



config SHARPSL_PM_MAX1111

	bool

	depends on !CORGI_SSP_DEPRECATED

	select HWMON

	select SENSORS_MAX1111



config CORGI_SSP_DEPRECATED

	bool
@@ -547,7 +553,6 @@ config MACH_E740 
	bool "Toshiba e740"

	default y

	depends on ARCH_PXA_ESERIES

	select FB_W100

	help

	  Say Y here if you intend to run this kernel on a Toshiba

	  e740 family PDA.
@@ -556,7 +561,6 @@ config MACH_E750 
	bool "Toshiba e750"

	default y

	depends on ARCH_PXA_ESERIES

	select FB_W100

	help

	  Say Y here if you intend to run this kernel on a Toshiba

	  e750 family PDA.
@@ -573,7 +577,6 @@ config MACH_E800 
	bool "Toshiba e800"

	default y

	depends on ARCH_PXA_ESERIES

	select FB_W100

	help

	  Say Y here if you intend to run this kernel on a Toshiba

	  e800 family PDA.

arch/arm/mach-pxa/imote2.c

+0 −4
Original line number Diff line number Diff line
@@ -559,10 +559,6 @@ static void __init imote2_init(void) 
	pxa_set_btuart_info(NULL);

	pxa_set_stuart_info(NULL);



	/* SPI chip select directions - all other directions should

	 * be handled by drivers.*/

	gpio_direction_output(37, 0);



	platform_add_devices(imote2_devices, ARRAY_SIZE(imote2_devices));



	pxa2xx_set_spi_info(1, &pxa_ssp_master_0_info);

arch/arm/mach-pxa/include/mach/uncompress.h

+8 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
#define BTUART_BASE	(0x40200000)

#define STUART_BASE	(0x40700000)



static unsigned long uart_base = FFUART_BASE;

static unsigned int uart_shift = 2;

static unsigned int uart_is_pxa = 1;

static unsigned long uart_base;

static unsigned int uart_shift;

static unsigned int uart_is_pxa;



static inline unsigned char uart_read(int offset)

{
@@ -56,6 +56,11 @@ static inline void flush(void) 


static inline void arch_decomp_setup(void)

{

	/* initialize to default */

	uart_base = FFUART_BASE;

	uart_shift = 2;

	uart_is_pxa = 1;



	if (machine_is_littleton() || machine_is_intelmote2()

	    || machine_is_csb726() || machine_is_stargate2()

	    || machine_is_cm_x300() || machine_is_balloon3())