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

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

ARM: OMAP2: Remove legacy USB FS support 



The FS (Full Speed) USB controller is available on 2420 and 2430,
but not being used.

Out of the 2420 based boards only Nokia N8X0 are seeing active
development and they have external HS (High Speed) TUSB controller.
On omap 2430sdp there is MUSB HS controller, so there's no need
to use the legacy USB FS controller.

That leaves only H4 and Apollon boards that could use the FS USB
controller. As both H4 and Apollon boards are old proprietary
development boards, it's unlikely that we have any active
developers working on those boards using the USB.

So remove the FS USB support for omap2 machines. Patches are
welcome if somebody wants to instead fix it all up to the
current standards.

Cc: linux-usb@vger.kernel.org
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a22ab1c4

arch/arm/mach-omap2/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -64,13 +64,11 @@ config SOC_OMAP2420 
	depends on ARCH_OMAP2

	default y

	select OMAP_DM_TIMER

	select ARCH_OMAP_OTG



config SOC_OMAP2430

	bool "OMAP2430 support"

	depends on ARCH_OMAP2

	default y

	select ARCH_OMAP_OTG



config SOC_OMAP3430

	bool "OMAP3430 support"

arch/arm/mach-omap2/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -244,9 +244,6 @@ obj-y += $(omap-flash-y) $(omap-flash-m) 
omap-hsmmc-$(CONFIG_MMC_OMAP_HS)	:= hsmmc.o

obj-y					+= $(omap-hsmmc-m) $(omap-hsmmc-y)





usbfs-$(CONFIG_ARCH_OMAP_OTG)		:= usb-fs.o

obj-y					+= $(usbfs-m) $(usbfs-y)

obj-y					+= usb-musb.o

obj-y					+= omap_phy_internal.o

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

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

};



static struct omap_usb_config sdp2430_usb_config __initdata = {

	.otg		= 1,

#ifdef  CONFIG_USB_GADGET_OMAP

	.hmc_mode	= 0x0,

#elif   defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

	.hmc_mode	= 0x1,

#endif

	.pins[0]	= 3,

};



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },
@@ -280,7 +270,6 @@ static void __init omap_2430sdp_init(void) 
	omap_serial_init();

	omap_sdrc_init(NULL, NULL);

	omap_hsmmc_init(mmc);

	omap2_usbfs_init(&sdp2430_usb_config);



	omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP);

	usb_musb_init(NULL);

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

+0 −18
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <asm/mach/flash.h>



#include <plat/led.h>

#include <plat/usb.h>

#include <plat/board.h>

#include "common.h"

#include <plat/gpmc.h>
@@ -253,13 +252,6 @@ static inline void __init apollon_init_smc91x(void) 
	clk_put(gpmc_fck);

}



static struct omap_usb_config apollon_usb_config __initdata = {

	.register_dev	= 1,

	.hmc_mode	= 0x14,	/* 0:dev 1:host1 2:disable */



	.pins[0]	= 6,

};



static struct panel_generic_dpi_data apollon_panel_data = {

	.name			= "apollon",

};
@@ -297,15 +289,6 @@ static void __init apollon_led_init(void) 
	gpio_request_array(apollon_gpio_leds, ARRAY_SIZE(apollon_gpio_leds));

}



static void __init apollon_usb_init(void)

{

	/* USB device */

	/* DEVICE_SUSPEND */

	omap_mux_init_signal("mcbsp2_clkx.gpio_12", 0);

	gpio_request_one(12, GPIOF_OUT_INIT_LOW, "USB suspend");

	omap2_usbfs_init(&apollon_usb_config);

}



#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	{ .reg_offset = OMAP_MUX_TERMINATOR },
@@ -321,7 +304,6 @@ static void __init omap_apollon_init(void) 
	apollon_init_smc91x();

	apollon_led_init();

	apollon_flash_init();

	apollon_usb_init();



	/* REVISIT: where's the correct place */

	omap_mux_init_signal("sys_nirq", OMAP_PULL_ENA | OMAP_PULL_UP);

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

+0 −13
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include <plat/usb.h>

#include <plat/board.h>

#include "common.h"

#include <plat/menelaus.h>
@@ -329,17 +328,6 @@ static void __init h4_init_flash(void) 
	h4_flash_resource.end	= base + SZ_64M - 1;

}



static struct omap_usb_config h4_usb_config __initdata = {

	/* S1.10 OFF -- usb "download port"

	 * usb0 switched to Mini-B port and isp1105 transceiver;

	 * S2.POS3 = ON, S2.POS4 = OFF ... to enable battery charging

	 */

	.register_dev	= 1,

	.pins[0]	= 3,

/*	.hmc_mode	= 0x14,*/	/* 0:dev 1:host 2:disable */

	.hmc_mode	= 0x00,		/* 0:dev|otg 1:disable 2:disable */

};



static struct at24_platform_data m24c01 = {

	.byte_len	= SZ_1K / 8,

	.page_size	= 16,
@@ -381,7 +369,6 @@ static void __init omap_h4_init(void) 
			ARRAY_SIZE(h4_i2c_board_info));



	platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));

	omap2_usbfs_init(&h4_usb_config);

	omap_serial_init();

	omap_sdrc_init(NULL, NULL);

	h4_init_flash();