Commit ad501bce 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] 4569/1: ep93xx_gpio_irq_type(): fix spurious enumeration offset for FGPIO handling
  [ARM] 4568/1: fix l2x0 cache invalidate handling of unaligned addresses
parents da8f153e 8742bc92

arch/arm/mach-ep93xx/core.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static int ep93xx_gpio_irq_type(unsigned int irq, unsigned int type) 
	if (line >= 0 && line < 16) {

		gpio_line_config(line, GPIO_IN);

	} else {

		gpio_line_config(EP93XX_GPIO_LINE_F(line), GPIO_IN);

		gpio_line_config(EP93XX_GPIO_LINE_F(line-16), GPIO_IN);

	}



	port = line >> 3;

arch/arm/mm/cache-l2x0.c

+11 −1
Original line number Diff line number Diff line
@@ -57,7 +57,17 @@ static void l2x0_inv_range(unsigned long start, unsigned long end) 
{

	unsigned long addr;



	if (start & (CACHE_LINE_SIZE - 1)) {

		start &= ~(CACHE_LINE_SIZE - 1);

		sync_writel(start, L2X0_CLEAN_INV_LINE_PA, 1);

		start += CACHE_LINE_SIZE;

	}



	if (end & (CACHE_LINE_SIZE - 1)) {

		end &= ~(CACHE_LINE_SIZE - 1);

		sync_writel(end, L2X0_CLEAN_INV_LINE_PA, 1);

	}



	for (addr = start; addr < end; addr += CACHE_LINE_SIZE)

		sync_writel(addr, L2X0_INV_LINE_PA, 1);

	cache_sync();