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

Commit 7c8d20d4 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: 6164/1: Add kto and kfrom to input operands list.
  ARM: 6166/1: Proper prefetch abort handling on pre-ARMv6
  ARM: 6165/1: trap overflows on highmem pages from kmap_atomic when debugging
  ARM: 6152/1: ux500 make it possible to disable localtimers
  [ARM] pxa/spitz: Correctly register WM8750
  [ARM] pxa/palmtc: storage class should be before const qualifier
  ARM: 6146/1: sa1111: Prevent deadlock in resume path
  ARM: 6145/1: ux500 MTU clockrate correction
  ARM: 6144/1: TCM memory bug freeing bug
  ARM: VFP: Fix vfp_put_double() for d16-d31
parents 63a07cb6 9a40ac86

arch/arm/common/sa1111.c

+7 −2
Original line number Diff line number Diff line
@@ -951,8 +951,6 @@ static int sa1111_resume(struct platform_device *dev) 
	if (!save)

		return 0;



	spin_lock_irqsave(&sachip->lock, flags);



	/*

	 * Ensure that the SA1111 is still here.

	 * FIXME: shouldn't do this here.
@@ -969,6 +967,13 @@ static int sa1111_resume(struct platform_device *dev) 
	 * First of all, wake up the chip.

	 */

	sa1111_wake(sachip);



	/*

	 * Only lock for write ops. Also, sa1111_wake must be called with

	 * released spinlock!

	 */

	spin_lock_irqsave(&sachip->lock, flags);



	sa1111_writel(0, sachip->base + SA1111_INTC + SA1111_INTEN0);

	sa1111_writel(0, sachip->base + SA1111_INTC + SA1111_INTEN1);

arch/arm/mach-nomadik/clock.c

+7 −4
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ void clk_disable(struct clk *clk) 
}

EXPORT_SYMBOL(clk_disable);



/* We have a fixed clock alone, for now */

static struct clk clk_24 = {

	.rate = 2400000,

};



static struct clk clk_48 = {

	.rate = 48 * 1000 * 1000,

};
@@ -50,6 +53,8 @@ static struct clk clk_default; 
	}



static struct clk_lookup lookups[] = {

	CLK(&clk_24, "mtu0"),

	CLK(&clk_24, "mtu1"),

	CLK(&clk_48, "uart0"),

	CLK(&clk_48, "uart1"),

	CLK(&clk_default, "gpio.0"),
@@ -59,10 +64,8 @@ static struct clk_lookup lookups[] = { 
	CLK(&clk_default, "rng"),

};



static int __init clk_init(void)

int __init clk_init(void)

{

	clkdev_add_table(lookups, ARRAY_SIZE(lookups));

	return 0;

}
 


arch_initcall(clk_init);

arch/arm/mach-nomadik/clock.h

+2 −0
Original line number Diff line number Diff line
@@ -11,3 +11,5 @@ 
struct clk {

	unsigned long		rate;

};



int __init clk_init(void);

arch/arm/mach-nomadik/cpu-8815.c

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include <asm/cacheflush.h>

#include <asm/hardware/cache-l2x0.h>



#include "clock.h"



#define __MEM_4K_RESOURCE(x) \

	.res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM}
@@ -143,6 +145,12 @@ void __init cpu8815_init_irq(void) 
	/* This modified VIC cell has two register blocks, at 0 and 0x20 */

	vic_init(io_p2v(NOMADIK_IC_BASE + 0x00), IRQ_VIC_START +  0, ~0, 0);

	vic_init(io_p2v(NOMADIK_IC_BASE + 0x20), IRQ_VIC_START + 32, ~0, 0);



	/*

	 * Init clocks here so that they are available for system timer

	 * initialization.

	 */

	clk_init();

}



/*

arch/arm/mach-pxa/palmtc.c

+2 −2
Original line number Diff line number Diff line
@@ -263,11 +263,11 @@ const struct matrix_keymap_data palmtc_keymap_data = { 
	.keymap_size		= ARRAY_SIZE(palmtc_matrix_keys),

};



const static unsigned int palmtc_keypad_row_gpios[] = {

static const unsigned int palmtc_keypad_row_gpios[] = {

	0, 9, 10, 11

};



const static unsigned int palmtc_keypad_col_gpios[] = {

static const unsigned int palmtc_keypad_col_gpios[] = {

	18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 79, 80

};