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

Commit 9e18630b authored by Mike Rapoport's avatar Mike Rapoport Committed by Tony Lindgren
Browse files

omap: musb: introduce default board config 



Most boards use exactly the same configuration for musb initialization.
Create a default that can be shared amount different boards.

Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 9a3f39ff

arch/arm/mach-omap2/board-2430sdp.c

+1 −6
Original line number Diff line number Diff line
@@ -208,11 +208,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = { 
	{}	/* Terminator */

};



static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_ULPI,

	.mode			= MUSB_OTG,

	.power			= 100,

};

static struct omap_usb_config sdp2430_usb_config __initdata = {

	.otg		= 1,

#ifdef  CONFIG_USB_GADGET_OMAP
@@ -246,7 +241,7 @@ static void __init omap_2430sdp_init(void) 
	omap2_usbfs_init(&sdp2430_usb_config);



	omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP);

	usb_musb_init(&musb_board_data);

	usb_musb_init(NULL);



	board_smc91x_init();

arch/arm/mach-omap2/board-3430sdp.c

+1 −7
Original line number Diff line number Diff line
@@ -810,12 +810,6 @@ static struct flash_partitions sdp_flash_partitions[] = { 
	},

};



static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_ULPI,

	.mode			= MUSB_OTG,

	.power			= 100,

};



static void __init omap_3430sdp_init(void)

{

	int gpio_pendown;
@@ -832,7 +826,7 @@ static void __init omap_3430sdp_init(void) 
		gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;

	omap_ads7846_init(1, gpio_pendown, 310, NULL);

	board_serial_init();

	usb_musb_init(&musb_board_data);

	usb_musb_init(NULL);

	board_smc91x_init();

	board_flash_init(sdp_flash_partitions, chip_sel_3430, 0);

	sdp3430_display_init();

arch/arm/mach-omap2/board-cm-t35.c

+1 −7
Original line number Diff line number Diff line
@@ -653,12 +653,6 @@ static struct omap_board_mux board_mux[] __initdata = { 
};

#endif



static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_ULPI,

	.mode			= MUSB_OTG,

	.power			= 100,

};



static struct omap_board_config_kernel cm_t35_config[] __initdata = {

};
@@ -675,7 +669,7 @@ static void __init cm_t35_init(void) 
	cm_t35_init_led();

	cm_t35_init_display();



	usb_musb_init(&musb_board_data);

	usb_musb_init(NULL);

	usbhs_init(&usbhs_bdata);

}

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

+1 −7
Original line number Diff line number Diff line
@@ -509,12 +509,6 @@ static struct platform_device *devkit8000_devices[] __initdata = { 
	&omap_dm9000_dev,

};



static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_ULPI,

	.mode			= MUSB_OTG,

	.power			= 100,

};



static const struct usbhs_omap_board_data usbhs_bdata __initconst = {



	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
@@ -698,7 +692,7 @@ static void __init devkit8000_init(void) 


	omap_ads7846_init(2, OMAP3_DEVKIT_TS_GPIO, 0, NULL);



	usb_musb_init(&musb_board_data);

	usb_musb_init(NULL);

	usbhs_init(&usbhs_bdata);

	omap_nand_flash_init(NAND_BUSWIDTH_16, devkit8000_nand_partitions,

			     ARRAY_SIZE(devkit8000_nand_partitions));

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

+1 −7
Original line number Diff line number Diff line
@@ -559,12 +559,6 @@ static void __init igep2_i2c_init(void) 
		pr_warning("IGEP2: Could not register I2C3 bus (%d)\n", ret);

}



static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_ULPI,

	.mode			= MUSB_OTG,

	.power			= 100,

};



static const struct usbhs_omap_board_data usbhs_bdata __initconst = {

	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,
@@ -637,7 +631,7 @@ static void __init igep2_init(void) 
	platform_add_devices(igep2_devices, ARRAY_SIZE(igep2_devices));

	omap_display_init(&igep2_dss_data);

	omap_serial_init();

	usb_musb_init(&musb_board_data);

	usb_musb_init(NULL);

	usbhs_init(&usbhs_bdata);



	igep2_flash_init();