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

Commit 82f4fe70 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'for-v3.13-rc/hwmod-fixes-b' of... 

Merge tag 'for-v3.13-rc/hwmod-fixes-b' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into debug-ll-and-ldp-backlight-fix

A few OMAP hwmod fixes for v3.13-rc.  One patch fixes some IRQ
problems with GPMC, RNG, and ISP/IVA MMUs on OMAP2/3.  The other fixes
some problems with DEBUG_LL on DRA7xx.

Basic build, boot, and PM test logs are available here:

http://www.pwsan.com/omap/testlogs/hwmod_fixes_b_v3.13-rc/20131226021920/
parents 7e367c18 6d4c8830

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

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




/* gpmc */

/* gpmc */

static struct omap_hwmod_irq_info omap2xxx_gpmc_irqs[] = {

static struct omap_hwmod_irq_info omap2xxx_gpmc_irqs[] = {

	{ .irq = 20 },

	{ .irq = 20 + OMAP_INTC_START, },

	{ .irq = -1 }

	{ .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[] = {

static struct omap_hwmod_irq_info omap2_rng_mpu_irqs[] = {

	{ .irq = 52 },

	{ .irq = 52 + OMAP_INTC_START, },

	{ .irq = -1 }

	{ .irq = -1 }

};

};

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+3 −3
Original line number Original line 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[] = {

static struct omap_hwmod_irq_info omap3xxx_gpmc_irqs[] = {

	{ .irq = 20 },

	{ .irq = 20 + OMAP_INTC_START, },

	{ .irq = -1 }

	{ .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 omap3xxx_mmu_isp_hwmod;

static struct omap_hwmod_irq_info omap3xxx_mmu_isp_irqs[] = {

static struct omap_hwmod_irq_info omap3xxx_mmu_isp_irqs[] = {

	{ .irq = 24 },

	{ .irq = 24 + OMAP_INTC_START, },

	{ .irq = -1 }

	{ .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 omap3xxx_mmu_iva_hwmod;

static struct omap_hwmod_irq_info omap3xxx_mmu_iva_irqs[] = {

static struct omap_hwmod_irq_info omap3xxx_mmu_iva_irqs[] = {

	{ .irq = 28 },

	{ .irq = 28 + OMAP_INTC_START, },

	{ .irq = -1 }

	{ .irq = -1 }

};

};

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

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

	.class		= &dra7xx_uart_hwmod_class,

	.clkdm_name	= "l4per_clkdm",

	.clkdm_name	= "l4per_clkdm",

	.main_clk	= "uart1_gfclk_mux",

	.main_clk	= "uart1_gfclk_mux",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.flags		= HWMOD_SWSUP_SIDLE_ACT | DEBUG_OMAP2UART1_FLAGS,

	.prcm = {

	.prcm = {

		.omap4 = {

		.omap4 = {

			.clkctrl_offs = DRA7XX_CM_L4PER_UART1_CLKCTRL_OFFSET,

			.clkctrl_offs = DRA7XX_CM_L4PER_UART1_CLKCTRL_OFFSET,