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

Commit 8c11499a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-fixes-for-linus' of... 

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  omap: Fix wrong condition check in while loop for mailbox and iommu2
  omap: rng: Use resource_size instead of manual calculation
  omap: Fix MMC gpio_wp for BeagleBoard C2 and above
  omap: Fix matrix_keymap_data usage
  omap: Fix a OMAP_MPUIO_VBASE typo for 850
  omap: Fix wrong jtag_id for 850
  omap: iovmm: Fix compiler warning
  omap: mailbox: Flush posted write when acking mailbox irq
  omap: mailbox: Execute softreset at startup
  omap: Add missing mux pin for EHCI phy reset line
  omap: Fix 44xx compile
  omap: Fix mcspi compile for 2420
  omap: Fix compile for arch/arm/mach-omap2
parents 342a5971 055c49d2

arch/arm/mach-omap1/id.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static struct omap_id omap_ids[] __initdata = { 
	{ .jtag_id = 0xb574, .die_rev = 0x2, .omap_id = 0x03310315, .type = 0x03100000},

	{ .jtag_id = 0x355f, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x07300100},

	{ .jtag_id = 0xb55f, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x07300300},

	{ .jtag_id = 0xb55f, .die_rev = 0x0, .omap_id = 0x03320500, .type = 0x08500000},

	{ .jtag_id = 0xb62c, .die_rev = 0x1, .omap_id = 0x03320500, .type = 0x08500000},

	{ .jtag_id = 0xb470, .die_rev = 0x0, .omap_id = 0x03310100, .type = 0x15100000},

	{ .jtag_id = 0xb576, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x16100000},

	{ .jtag_id = 0xb576, .die_rev = 0x2, .omap_id = 0x03320100, .type = 0x16110000},

arch/arm/mach-omap2/board-3430sdp.c

+7 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 


#define TWL4030_MSECURE_GPIO 22



static int sdp3430_keymap[] = {

static int board_keymap[] = {

	KEY(0, 0, KEY_LEFT),

	KEY(0, 1, KEY_RIGHT),

	KEY(0, 2, KEY_A),
@@ -88,11 +88,15 @@ static int sdp3430_keymap[] = { 
	0

};



static struct matrix_keymap_data board_map_data = {

	.keymap			= board_keymap,

	.keymap_size		= ARRAY_SIZE(board_keymap),

};



static struct twl4030_keypad_data sdp3430_kp_data = {

	.keymap_data	= &board_map_data,

	.rows		= 5,

	.cols		= 6,

	.keymap		= sdp3430_keymap,

	.keymapsize	= ARRAY_SIZE(sdp3430_keymap),

	.rep		= 1,

};

arch/arm/mach-omap2/board-ldp.c

+7 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static struct platform_device ldp_smsc911x_device = { 
	},

};



static int ldp_twl4030_keymap[] = {

static int board_keymap[] = {

	KEY(0, 0, KEY_1),

	KEY(1, 0, KEY_2),

	KEY(2, 0, KEY_3),
@@ -101,11 +101,15 @@ static int ldp_twl4030_keymap[] = { 
	0

};



static struct matrix_keymap_data board_map_data = {

	.keymap			= board_keymap,

	.keymap_size		= ARRAY_SIZE(board_keymap),

};



static struct twl4030_keypad_data ldp_kp_twl4030_data = {

	.keymap_data	= &board_map_data,

	.rows		= 6,

	.cols		= 6,

	.keymap		= ldp_twl4030_keymap,

	.keymapsize	= ARRAY_SIZE(ldp_twl4030_keymap),

	.rep		= 1,

};

arch/arm/mach-omap2/board-omap3beagle.c

+6 −1
Original line number Diff line number Diff line
@@ -139,8 +139,13 @@ static struct gpio_led gpio_leds[]; 
static int beagle_twl_gpio_setup(struct device *dev,

		unsigned gpio, unsigned ngpio)

{

	/* gpio + 0 is "mmc0_cd" (input/IRQ) */

	if (system_rev >= 0x20 && system_rev <= 0x34301000) {

		omap_cfg_reg(AG9_34XX_GPIO23);

		mmc[0].gpio_wp = 23;

	} else {

		omap_cfg_reg(AH8_34XX_GPIO29);

	}

	/* gpio + 0 is "mmc0_cd" (input/IRQ) */

	mmc[0].gpio_cd = gpio + 0;

	twl4030_mmc_init(mmc);

arch/arm/mach-omap2/board-omap3evm.c

+7 −3
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static struct twl4030_usb_data omap3evm_usb_data = { 
	.usb_mode	= T2_USB_MODE_ULPI,

};



static int omap3evm_keymap[] = {

static int board_keymap[] = {

	KEY(0, 0, KEY_LEFT),

	KEY(0, 1, KEY_RIGHT),

	KEY(0, 2, KEY_A),
@@ -178,11 +178,15 @@ static int omap3evm_keymap[] = { 
	KEY(3, 3, KEY_P)

};



static struct matrix_keymap_data board_map_data = {

	.keymap			= board_keymap,

	.keymap_size		= ARRAY_SIZE(board_keymap),

};



static struct twl4030_keypad_data omap3evm_kp_data = {

	.keymap_data	= &board_map_data,

	.rows		= 4,

	.cols		= 4,

	.keymap		= omap3evm_keymap,

	.keymapsize	= ARRAY_SIZE(omap3evm_keymap),

	.rep		= 1,

};