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

Commit dd0cdd88 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: Move omap1 USB platform init code into mach-omap1/usb.c 



Move omap1 FS USB platform init code into mach-omap1/usb.c

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 98093839

arch/arm/mach-omap1/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ obj-y += $(i2c-omap-m) $(i2c-omap-y) 


led-y := leds.o



usb-fs-$(CONFIG_USB)			:= usb.o

obj-y					+= $(usb-fs-m) $(usb-fs-y)



# Specific board support

obj-$(CONFIG_MACH_OMAP_H2)		+= board-h2.o board-h2-mmc.o

obj-$(CONFIG_MACH_OMAP_INNOVATOR)	+= board-innovator.o

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

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static void __init ams_delta_init(void) 
	/* Clear latch2 (NAND, LCD, modem enable) */

	ams_delta_latch2_write(~0, 0);



	omap_usb_init(&ams_delta_usb_config);

	omap1_usb_init(&ams_delta_usb_config);

	platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));



#ifdef CONFIG_AMS_DELTA_FIQ

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

+2 −2
Original line number Diff line number Diff line
@@ -72,12 +72,12 @@ static void __init omap_generic_init(void) 
		omap_cfg_reg(UART3_TX);

		omap_cfg_reg(UART3_RX);



		omap_usb_init(&generic1510_usb_config);

		omap1_usb_init(&generic1510_usb_config);

	}

#endif

#if defined(CONFIG_ARCH_OMAP16XX)

	if (!cpu_is_omap1510()) {

		omap_usb_init(&generic1610_usb_config);

		omap1_usb_init(&generic1610_usb_config);

	}

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static void __init h2_init(void) 
	omap_serial_init();

	omap_register_i2c_bus(1, 100, h2_i2c_board_info,

			      ARRAY_SIZE(h2_i2c_board_info));

	omap_usb_init(&h2_usb_config);

	omap1_usb_init(&h2_usb_config);

	h2_mmc_init();

}

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

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static void __init h3_init(void) 
	omap_serial_init();

	omap_register_i2c_bus(1, 100, h3_i2c_board_info,

			      ARRAY_SIZE(h3_i2c_board_info));

	omap_usb_init(&h3_usb_config);

	omap1_usb_init(&h3_usb_config);

	h3_mmc_init();

}