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

Commit 4bde23f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull arm-soc fixes from Olof Johansson:
 "This is a first pass of some of the merge window fallout for ARM
  platforms.

  Nothing controversial:
   - A system.h fallout fix for OMAP
   - PXA fixes for breakage caused by the regulator struct changes
   - GPIO fixes for OMAP to properly deal with dynamic IRQ allocation
   - A mismerge in our arm-soc tree of an lpc32xx change for networking
   - A fix for USB setup on tegra
   - An undo of __init annotation of display mux setup on OMAP that's
     needed at runtime"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: pxa: fix build issue on stargate2
  ARM: pxa: fix build issue on cm-x300
  ARM: pxa: fix build failure for regulator consumer in em-x270.c
  ARM: LPC32xx: clock.c: Fix lpc-eth clock reference
  ARM: OMAP: pm: fix compilation break
  ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition
  drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()
  ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()
  ARM: pxa: fix regulator related build fail in magician_defconfig
  ARM: tegra: Fix device tree AUXDATA for USB/EHCI
  ARM: OMAP2+: Remove __init from DSI mux functions
parents e152c38a f00e9b11

arch/arm/mach-lpc32xx/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -1134,7 +1134,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK(NULL, "i2s1_ck", clk_i2s1)

	_REGISTER_CLOCK("ts-lpc32xx", NULL, clk_tsc)

	_REGISTER_CLOCK("dev:mmc0", NULL, clk_mmc)

	_REGISTER_CLOCK("lpc-net.0", NULL, clk_net)

	_REGISTER_CLOCK("lpc-eth.0", NULL, clk_net)

	_REGISTER_CLOCK("dev:clcd", NULL, clk_lcd)

	_REGISTER_CLOCK("lpc32xx_udc", "ck_usbd", clk_usbd)

	_REGISTER_CLOCK("lpc32xx_rtc", NULL, clk_rtc)

arch/arm/mach-omap1/board-h2.c

+4 −4
Original line number Diff line number Diff line
@@ -245,8 +245,6 @@ static struct resource h2_smc91x_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= OMAP_GPIO_IRQ(0),

		.end	= OMAP_GPIO_IRQ(0),

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,

	},

};
@@ -359,11 +357,9 @@ static struct tps65010_board tps_board = { 
static struct i2c_board_info __initdata h2_i2c_board_info[] = {

	{

		I2C_BOARD_INFO("tps65010", 0x48),

		.irq            = OMAP_GPIO_IRQ(58),

		.platform_data	= &tps_board,

	}, {

		I2C_BOARD_INFO("isp1301_omap", 0x2d),

		.irq		= OMAP_GPIO_IRQ(2),

	},

};
@@ -428,8 +424,12 @@ static void __init h2_init(void) 
	omap_cfg_reg(E19_1610_KBR4);

	omap_cfg_reg(N19_1610_KBR5);



	h2_smc91x_resources[1].start = gpio_to_irq(0);

	h2_smc91x_resources[1].end = gpio_to_irq(0);

	platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));

	omap_serial_init();

	h2_i2c_board_info[0].irq = gpio_to_irq(58);

	h2_i2c_board_info[1].irq = gpio_to_irq(2);

	omap_register_i2c_bus(1, 100, h2_i2c_board_info,

			      ARRAY_SIZE(h2_i2c_board_info));

	omap1_usb_init(&h2_usb_config);

arch/arm/mach-omap1/board-h3.c

+4 −5
Original line number Diff line number Diff line
@@ -247,8 +247,6 @@ static struct resource smc91x_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= OMAP_GPIO_IRQ(40),

		.end	= OMAP_GPIO_IRQ(40),

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,

	},

};
@@ -338,7 +336,6 @@ static struct spi_board_info h3_spi_board_info[] __initdata = { 
		.modalias	= "tsc2101",

		.bus_num	= 2,

		.chip_select	= 0,

		.irq		= OMAP_GPIO_IRQ(H3_TS_GPIO),

		.max_speed_hz	= 16000000,

		/* .platform_data	= &tsc_platform_data, */

	},
@@ -374,11 +371,9 @@ static struct omap_lcd_config h3_lcd_config __initdata = { 
static struct i2c_board_info __initdata h3_i2c_board_info[] = {

       {

		I2C_BOARD_INFO("tps65013", 0x48),

               /* .irq         = OMAP_GPIO_IRQ(??), */

       },

	{

		I2C_BOARD_INFO("isp1301_omap", 0x2d),

		.irq		= OMAP_GPIO_IRQ(14),

	},

};
@@ -420,10 +415,14 @@ static void __init h3_init(void) 
	omap_cfg_reg(E19_1610_KBR4);

	omap_cfg_reg(N19_1610_KBR5);



	smc91x_resources[1].start = gpio_to_irq(40);

	smc91x_resources[1].end = gpio_to_irq(40);

	platform_add_devices(devices, ARRAY_SIZE(devices));

	h3_spi_board_info[0].irq = gpio_to_irq(H3_TS_GPIO);

	spi_register_board_info(h3_spi_board_info,

				ARRAY_SIZE(h3_spi_board_info));

	omap_serial_init();

	h3_i2c_board_info[1].irq = gpio_to_irq(14);

	omap_register_i2c_bus(1, 100, h3_i2c_board_info,

			      ARRAY_SIZE(h3_i2c_board_info));

	omap1_usb_init(&h3_usb_config);

arch/arm/mach-omap1/board-htcherald.c

+3 −3
Original line number Diff line number Diff line
@@ -324,8 +324,6 @@ static struct platform_device gpio_leds_device = { 


static struct resource htcpld_resources[] = {

	[0] = {

		.start  = OMAP_GPIO_IRQ(HTCHERALD_GIRQ_BTNS),

		.end    = OMAP_GPIO_IRQ(HTCHERALD_GIRQ_BTNS),

		.flags  = IORESOURCE_IRQ,

	},

};
@@ -450,7 +448,6 @@ static struct spi_board_info __initdata htcherald_spi_board_info[] = { 
	{

		.modalias		= "ads7846",

		.platform_data		= &htcherald_ts_platform_data,

		.irq			= OMAP_GPIO_IRQ(HTCHERALD_GPIO_TS),

		.max_speed_hz		= 2500000,

		.bus_num		= 2,

		.chip_select		= 1,
@@ -576,6 +573,8 @@ static void __init htcherald_init(void) 
	printk(KERN_INFO "HTC Herald init.\n");



	/* Do board initialization before we register all the devices */

	htcpld_resources[0].start = gpio_to_irq(HTCHERALD_GIRQ_BTNS);

	htcpld_resources[0].end = gpio_to_irq(HTCHERALD_GIRQ_BTNS);

	platform_add_devices(devices, ARRAY_SIZE(devices));



	htcherald_disable_watchdog();
@@ -583,6 +582,7 @@ static void __init htcherald_init(void) 
	htcherald_usb_enable();

	omap1_usb_init(&htcherald_usb_config);



	htcherald_spi_board_info[0].irq = gpio_to_irq(HTCHERALD_GPIO_TS);

	spi_register_board_info(htcherald_spi_board_info,

		ARRAY_SIZE(htcherald_spi_board_info));

arch/arm/mach-omap1/board-innovator.c

+2 −2
Original line number Diff line number Diff line
@@ -248,8 +248,6 @@ static struct resource innovator1610_smc91x_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= OMAP_GPIO_IRQ(0),

		.end	= OMAP_GPIO_IRQ(0),

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,

	},

};
@@ -409,6 +407,8 @@ static void __init innovator_init(void) 
#endif

#ifdef CONFIG_ARCH_OMAP16XX

	if (!cpu_is_omap1510()) {

		innovator1610_smc91x_resources[1].start = gpio_to_irq(0);

		innovator1610_smc91x_resources[1].end = gpio_to_irq(0);

		platform_add_devices(innovator1610_devices, ARRAY_SIZE(innovator1610_devices));

	}

#endif