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

Commit 346cc220 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for-tony' of... 

Merge branch 'for-tony' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into omap-for-v4.4/soc
parents 3ea4a182 bf4c9449

arch/arm/mach-omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ config ARCH_OMAP2PLUS 
	select SOC_BUS

	select TI_PRIV_EDMA

	select OMAP_IRQCHIP

	select CLKSRC_TI_32K

	help

	  Systems based on OMAP2, OMAP3, OMAP4 or OMAP5

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

+5 −5
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)") 
	.map_io		= omap242x_map_io,

	.init_early	= omap2420_init_early,

	.init_machine	= omap_generic_init,

	.init_time	= omap2_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= omap242x_boards_compat,

	.restart	= omap2xxx_restart,

MACHINE_END
@@ -63,7 +63,7 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)") 
	.map_io		= omap243x_map_io,

	.init_early	= omap2430_init_early,

	.init_machine	= omap_generic_init,

	.init_time	= omap2_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= omap243x_boards_compat,

	.restart	= omap2xxx_restart,

MACHINE_END
@@ -82,7 +82,7 @@ DT_MACHINE_START(OMAP3_N900_DT, "Nokia RX-51 board") 
	.init_early	= omap3430_init_early,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= n900_boards_compat,

	.restart	= omap3xxx_restart,

MACHINE_END
@@ -100,7 +100,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
	.init_early	= omap3430_init_early,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= omap3_boards_compat,

	.restart	= omap3xxx_restart,

MACHINE_END
@@ -116,7 +116,7 @@ DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)") 
	.init_early	= omap3630_init_early,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.init_time	= omap_init_time,

	.dt_compat	= omap36xx_boards_compat,

	.restart	= omap3xxx_restart,

MACHINE_END

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

+1 −1
Original line number Diff line number Diff line
@@ -424,6 +424,6 @@ MACHINE_START(OMAP_LDP, "OMAP LDP board") 
	.init_irq	= omap3_init_irq,

	.init_machine	= omap_ldp_init,

	.init_late	= omap3430_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.init_time	= omap_init_time,

	.restart	= omap3xxx_restart,

MACHINE_END

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

+1 −1
Original line number Diff line number Diff line
@@ -136,6 +136,6 @@ MACHINE_START(NOKIA_RX51, "Nokia RX-51 board") 
	.init_irq	= omap3_init_irq,

	.init_machine	= rx51_init,

	.init_late	= omap3430_init_late,

	.init_time	= omap3_sync32k_timer_init,

	.init_time	= omap_init_time,

	.restart	= omap3xxx_restart,

MACHINE_END

arch/arm/mach-omap2/common.h

+1 −2
Original line number Diff line number Diff line
@@ -88,8 +88,7 @@ static inline int omap_mux_late_init(void) 


extern void omap2_init_common_infrastructure(void);



extern void omap2_sync32k_timer_init(void);

extern void omap3_sync32k_timer_init(void);

extern void omap_init_time(void);

extern void omap3_secure_sync32k_timer_init(void);

extern void omap3_gptimer_timer_init(void);

extern void omap4_local_timer_init(void);