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

Commit 1ff31056 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Orion5x: replace KEY_WLAN with KEY_WPS_BUTTON
  [ARM] Kirkwood: WPS button keycode mapping
  pxa168fb: fix incorrect resource calculation
  [ARM] pxa/raumfeld: fix button name
  [ARM] pxa/raumfeld: remove duplicated #include
  [ARM] locomo: fix unpaired spin_lock_irqsave
  [ARM] locomo: fix SPI register offset
  [ARM] pxa/sharpsl: add dependency of max1111 driver to sharpsl_pm
  [ARM] pxa: remove unnecessary 'select FB_W100' from some platforms
  [ARM] pxa: remove spi cs gpio direction to avoid clash with driver
  [ARM] mmp: fix for variables in uncompress.h being discarded
  [ARM] pxa: fix for variables in uncompress.h being discarded
  ARM: Update mach-types
  ARM: Fix IXP23xx build error in mach/memory.h
parents 6c75969e bb456928

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-ixp23xx/include/mach/memory.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 */

#define PHYS_OFFSET		(0x00000000)



#define IXP23XX_PCI_SDRAM_OFFSET (*((volatile int *)IXP23XX_PCI_SDRAM_BAR) & 0xfffffff0))

#define IXP23XX_PCI_SDRAM_OFFSET (*((volatile int *)IXP23XX_PCI_SDRAM_BAR) & 0xfffffff0)



#define __phys_to_bus(x)	((x) + (IXP23XX_PCI_SDRAM_OFFSET - PHYS_OFFSET))

#define __bus_to_phys(x)	((x) - (IXP23XX_PCI_SDRAM_OFFSET - PHYS_OFFSET))

arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c

+2 −2
Original line number Diff line number Diff line
@@ -74,9 +74,9 @@ static struct gpio_keys_button mv88f6281gtw_ge_button_pins[] = { 
		.desc		= "SWR Button",

		.active_low	= 1,

	}, {

		.code		= KEY_F1,

		.code		= KEY_WPS_BUTTON,

		.gpio		= 46,

		.desc		= "WPS Button(F1)",

		.desc		= "WPS Button",

		.active_low	= 1,

	},

};

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-orion5x/wrt350n-v2-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static struct gpio_keys_button wrt350n_v2_buttons[] = { 
		.desc		= "Reset Button",

		.active_low	= 1,

	}, {

		.code		= KEY_WLAN,

		.code		= KEY_WPS_BUTTON,

		.gpio		= 2,

		.desc		= "WPS Button",

		.active_low	= 1,