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

Commit d7ada73c 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:
 "Another smallish batch of fixes, it's been quiet due to the holidays.
  Nothing controversial here, a handful of things across the board"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: pxa: fix USB gadget driver compilation regression
  ARM: OMAP2+: Fix LCD panel backlight regression for LDP legacy booting
  ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data
  ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL
  ARM: shmobile: r8a7790: fix shdi resource sizes
  ARM: shmobile: bockw: fixup DMA mask
  ARM: shmobile: armadillo: Add PWM backlight power supply
parents 8cf126d9 9b17c165

arch/arm/boot/dts/r8a7790.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ 


	sdhi0: sdhi@ee100000 {

		compatible = "renesas,sdhi-r8a7790";

		reg = <0 0xee100000 0 0x100>;

		reg = <0 0xee100000 0 0x200>;

		interrupt-parent = <&gic>;

		interrupts = <0 165 4>;

		cap-sd-highspeed;
@@ -250,7 +250,7 @@ 


	sdhi1: sdhi@ee120000 {

		compatible = "renesas,sdhi-r8a7790";

		reg = <0 0xee120000 0 0x100>;

		reg = <0 0xee120000 0 0x200>;

		interrupt-parent = <&gic>;

		interrupts = <0 166 4>;

		cap-sd-highspeed;

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

+6 −1
Original line number Diff line number Diff line
@@ -242,12 +242,18 @@ static void __init ldp_display_init(void) 


static int ldp_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio)

{

	int res;



	/* LCD enable GPIO */

	ldp_lcd_pdata.enable_gpio = gpio + 7;



	/* Backlight enable GPIO */

	ldp_lcd_pdata.backlight_gpio = gpio + 15;



	res = platform_device_register(&ldp_lcd_device);

	if (res)

		pr_err("Unable to register LCD: %d\n", res);



	return 0;

}
@@ -346,7 +352,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = { 


static struct platform_device *ldp_devices[] __initdata = {

	&ldp_gpio_keys_device,

	&ldp_lcd_device,

};



#ifdef CONFIG_OMAP_MUX

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

+2 −2
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ struct omap_hwmod omap2xxx_counter_32k_hwmod = { 


/* gpmc */

static struct omap_hwmod_irq_info omap2xxx_gpmc_irqs[] = {

	{ .irq = 20 },

	{ .irq = 20 + OMAP_INTC_START, },

	{ .irq = -1 }

};
@@ -841,7 +841,7 @@ static struct omap_hwmod_class omap2_rng_hwmod_class = { 
};



static struct omap_hwmod_irq_info omap2_rng_mpu_irqs[] = {

	{ .irq = 52 },

	{ .irq = 52 + OMAP_INTC_START, },

	{ .irq = -1 }

};

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+3 −3
Original line number Diff line number Diff line
@@ -2165,7 +2165,7 @@ static struct omap_hwmod_class omap3xxx_gpmc_hwmod_class = { 
};



static struct omap_hwmod_irq_info omap3xxx_gpmc_irqs[] = {

	{ .irq = 20 },

	{ .irq = 20 + OMAP_INTC_START, },

	{ .irq = -1 }

};
@@ -2999,7 +2999,7 @@ static struct omap_mmu_dev_attr mmu_isp_dev_attr = { 


static struct omap_hwmod omap3xxx_mmu_isp_hwmod;

static struct omap_hwmod_irq_info omap3xxx_mmu_isp_irqs[] = {

	{ .irq = 24 },

	{ .irq = 24 + OMAP_INTC_START, },

	{ .irq = -1 }

};
@@ -3041,7 +3041,7 @@ static struct omap_mmu_dev_attr mmu_iva_dev_attr = { 


static struct omap_hwmod omap3xxx_mmu_iva_hwmod;

static struct omap_hwmod_irq_info omap3xxx_mmu_iva_irqs[] = {

	{ .irq = 28 },

	{ .irq = 28 + OMAP_INTC_START, },

	{ .irq = -1 }

};

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -1637,7 +1637,7 @@ static struct omap_hwmod dra7xx_uart1_hwmod = { 
	.class		= &dra7xx_uart_hwmod_class,

	.clkdm_name	= "l4per_clkdm",

	.main_clk	= "uart1_gfclk_mux",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.flags		= HWMOD_SWSUP_SIDLE_ACT | DEBUG_OMAP2UART1_FLAGS,

	.prcm = {

		.omap4 = {

			.clkctrl_offs = DRA7XX_CM_L4PER_UART1_CLKCTRL_OFFSET,