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

Commit c8458413 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

Merge branches 'powerdomain_fixes_3.1', 'hardware_workarounds_3.1',... 

Merge branches 'powerdomain_fixes_3.1', 'hardware_workarounds_3.1', 'hwmod_dss_fix_3.1' and 'i2c_fixes_3.1' into prcm-fixes-3.1
parents 9a2a3603 a57341f7 6d3c55fd

arch/arm/mach-omap1/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ 


# Common support

obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o

obj-y += clock.o clock_data.o opp_data.o reset.o

obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o



obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o



obj-$(CONFIG_OMAP_32K_TIMER)	+= timer32k.o



# Power Management

obj-$(CONFIG_PM) += pm.o sleep.o pm_bus.o

obj-$(CONFIG_PM) += pm.o sleep.o



# DSP

obj-$(CONFIG_OMAP_MBOX_FWK)	+= mailbox_mach.o

arch/arm/mach-omap1/board-ams-delta.c

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ void ams_delta_latch2_write(u16 mask, u16 value) 
static void __init ams_delta_init_irq(void)

{

	omap1_init_common_hw();

	omap_init_irq();

	omap1_init_irq();

}



static struct map_desc ams_delta_io_desc[] __initdata = {
@@ -391,7 +391,7 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)") 
	.reserve	= omap_reserve,

	.init_irq	= ams_delta_init_irq,

	.init_machine	= ams_delta_init,

	.timer		= &omap_timer,

	.timer		= &omap1_timer,

MACHINE_END



EXPORT_SYMBOL(ams_delta_latch1_write);

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

+2 −2
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static void __init omap_fsample_init(void) 
static void __init omap_fsample_init_irq(void)

{

	omap1_init_common_hw();

	omap_init_irq();

	omap1_init_irq();

}



/* Only FPGA needs to be mapped here. All others are done with ioremap */
@@ -394,5 +394,5 @@ MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample") 
	.reserve	= omap_reserve,

	.init_irq	= omap_fsample_init_irq,

	.init_machine	= omap_fsample_init,

	.timer		= &omap_timer,

	.timer		= &omap1_timer,

MACHINE_END

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

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
static void __init omap_generic_init_irq(void)

{

	omap1_init_common_hw();

	omap_init_irq();

	omap1_init_irq();

}



/* assume no Mini-AB port */
@@ -99,5 +99,5 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710") 
	.reserve	= omap_reserve,

	.init_irq	= omap_generic_init_irq,

	.init_machine	= omap_generic_init,

	.timer		= &omap_timer,

	.timer		= &omap1_timer,

MACHINE_END

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

+2 −2
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static struct i2c_board_info __initdata h2_i2c_board_info[] = { 
static void __init h2_init_irq(void)

{

	omap1_init_common_hw();

	omap_init_irq();

	omap1_init_irq();

}



static struct omap_usb_config h2_usb_config __initdata = {
@@ -466,5 +466,5 @@ MACHINE_START(OMAP_H2, "TI-H2") 
	.reserve	= omap_reserve,

	.init_irq	= h2_init_irq,

	.init_machine	= h2_init,

	.timer		= &omap_timer,

	.timer		= &omap1_timer,

MACHINE_END