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

Commit 3b68ae73 authored by Keshava Munegowda's avatar Keshava Munegowda Committed by Felipe Balbi
Browse files

arm: omap: usb: cleanup ehci and ohci resources and devices 



The prototype and defination of functions usb_ehci_init and
usb_ohci_init are removed. The ehci and ohci devices are
removed since usbhs device contains both ehci and ohci details.

Signed-off-by: default avatarKeshava Munegowda <keshava_mgowda@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 9e64bb1e

arch/arm/mach-omap2/usb-host.c

+26 −150
Original line number Diff line number Diff line
@@ -33,34 +33,46 @@ 


#ifdef CONFIG_MFD_OMAP_USB_HOST



static struct resource ehci_resources[] = {

#define OMAP_USBHS_DEVICE	"usbhs-omap"



static struct resource usbhs_resources[] = {

	{

		.name	= "uhh",

		.flags	= IORESOURCE_MEM,

	},

	{

		.name	= "tll",

		.flags	= IORESOURCE_MEM,

	},

	{

		.name	= "ehci",

		.flags	= IORESOURCE_MEM,

	},

	{

		.name	= "ehci-irq",

		.flags	= IORESOURCE_IRQ,

	},

	{

		.name	= "ohci",

		.flags	= IORESOURCE_MEM,

	},

	{         /* general IRQ */

	{

		.name	= "ohci-irq",

		.flags	= IORESOURCE_IRQ,

	}

};



static u64 ehci_dmamask = ~(u32)0;

static struct platform_device ehci_device = {

	.name           = "ehci-omap",

static struct platform_device usbhs_device = {

	.name		= OMAP_USBHS_DEVICE,

	.id		= 0,

	.dev = {

		.dma_mask               = &ehci_dmamask,

		.coherent_dma_mask      = 0xffffffff,

		.platform_data          = NULL,

	},

	.num_resources  = ARRAY_SIZE(ehci_resources),

	.resource       = ehci_resources,

	.num_resources	= ARRAY_SIZE(usbhs_resources),

	.resource	= usbhs_resources,

};



static struct usbhs_omap_platform_data		usbhs_data;

static struct ehci_hcd_omap_platform_data	ehci_data;

static struct ohci_hcd_omap_platform_data	ohci_data;



/* MUX settings for EHCI pins */

/*

 * setup_ehci_io_mux - initialize IO pad mux for USBHOST
@@ -326,81 +338,6 @@ static void setup_4430ehci_io_mux(const enum usbhs_omap_port_mode *port_mode) 
	}

}



void __init usb_ehci_init(const struct usbhs_omap_board_data *pdata)

{

	platform_device_add_data(&ehci_device, pdata, sizeof(*pdata));



	/* Setup Pin IO MUX for EHCI */

	if (cpu_is_omap34xx()) {

		ehci_resources[0].start	= OMAP34XX_EHCI_BASE;

		ehci_resources[0].end	= OMAP34XX_EHCI_BASE + SZ_1K - 1;

		ehci_resources[1].start	= OMAP34XX_UHH_CONFIG_BASE;

		ehci_resources[1].end	= OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1;

		ehci_resources[2].start	= OMAP34XX_USBTLL_BASE;

		ehci_resources[2].end	= OMAP34XX_USBTLL_BASE + SZ_4K - 1;

		ehci_resources[3].start = INT_34XX_EHCI_IRQ;

		setup_ehci_io_mux(pdata->port_mode);

	} else if (cpu_is_omap44xx()) {

		ehci_resources[0].start	= OMAP44XX_HSUSB_EHCI_BASE;

		ehci_resources[0].end	= OMAP44XX_HSUSB_EHCI_BASE + SZ_1K - 1;

		ehci_resources[1].start	= OMAP44XX_UHH_CONFIG_BASE;

		ehci_resources[1].end	= OMAP44XX_UHH_CONFIG_BASE + SZ_2K - 1;

		ehci_resources[2].start	= OMAP44XX_USBTLL_BASE;

		ehci_resources[2].end	= OMAP44XX_USBTLL_BASE + SZ_4K - 1;

		ehci_resources[3].start = OMAP44XX_IRQ_EHCI;

		setup_4430ehci_io_mux(pdata->port_mode);

	}



	ehci_resources[0].name	= "ehci";

	ehci_resources[1].name	= "uhh";

	ehci_resources[2].name	= "tll";

	ehci_resources[3].name	= "irq";



	if (platform_device_register(&ehci_device) < 0) {

		printk(KERN_ERR "Unable to register HS-USB (EHCI) device\n");

		return;

	}

}



static struct resource ohci_resources[] = {

	{

		.name	= "ohci",

		.start	= OMAP34XX_OHCI_BASE,

		.end	= OMAP34XX_OHCI_BASE + SZ_1K - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.name	= "uhh",

		.start	= OMAP34XX_UHH_CONFIG_BASE,

		.end	= OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.name	= "tll",

		.start	= OMAP34XX_USBTLL_BASE,

		.end	= OMAP34XX_USBTLL_BASE + SZ_4K - 1,

		.flags	= IORESOURCE_MEM,

	},

	{	/* general IRQ */

		.name	= "irq",

		.start	= INT_34XX_OHCI_IRQ,

		.flags	= IORESOURCE_IRQ,

	}

};



static u64 ohci_dmamask = DMA_BIT_MASK(32);



static struct platform_device ohci_device = {

	.name		= "ohci-omap3",

	.id		= 0,

	.dev = {

		.dma_mask		= &ohci_dmamask,

		.coherent_dma_mask	= 0xffffffff,

	},

	.num_resources	= ARRAY_SIZE(ohci_resources),

	.resource	= ohci_resources,

};



static void setup_ohci_io_mux(const enum usbhs_omap_port_mode *port_mode)

{

	switch (port_mode[0]) {
@@ -569,60 +506,6 @@ static void setup_4430ohci_io_mux(const enum usbhs_omap_port_mode *port_mode) 
	}

}



void __init usb_ohci_init(const struct usbhs_omap_board_data *pdata)

{

	platform_device_add_data(&ohci_device, pdata, sizeof(*pdata));



	/* Setup Pin IO MUX for OHCI */

	if (cpu_is_omap34xx())

		setup_ohci_io_mux(pdata->port_mode);



	if (platform_device_register(&ohci_device) < 0) {

		pr_err("Unable to register FS-USB (OHCI) device\n");

		return;

	}

}



#define OMAP_USBHS_DEVICE	"usbhs-omap"



static struct resource usbhs_resources[] = {

	{

		.name	= "uhh",

		.flags	= IORESOURCE_MEM,

	},

	{

		.name	= "tll",

		.flags	= IORESOURCE_MEM,

	},

	{

		.name	= "ehci",

		.flags	= IORESOURCE_MEM,

	},

	{

		.name	= "ehci-irq",

		.flags	= IORESOURCE_IRQ,

	},

	{

		.name	= "ohci",

		.flags	= IORESOURCE_MEM,

	},

	{

		.name	= "ohci-irq",

		.flags	= IORESOURCE_IRQ,

	}

};



static struct platform_device usbhs_device = {

	.name		= OMAP_USBHS_DEVICE,

	.id		= 0,

	.num_resources	= ARRAY_SIZE(usbhs_resources),

	.resource	= usbhs_resources,

};



static struct usbhs_omap_platform_data		usbhs_data;

static struct ehci_hcd_omap_platform_data	ehci_data;

static struct ohci_hcd_omap_platform_data	ohci_data;



void __init usbhs_init(const struct usbhs_omap_board_data *pdata)

{

	int	i;
@@ -686,13 +569,6 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata) 
{

}



void __init usb_ohci_init(const struct usbhs_omap_board_data *pdata)

{

}



void __init usb_ehci_init(const struct usbhs_omap_board_data *pdata)

{

}

#endif

arch/arm/plat-omap/include/plat/usb.h

+0 −4
Original line number Diff line number Diff line
@@ -98,10 +98,6 @@ enum musb_interface {MUSB_INTERFACE_ULPI, MUSB_INTERFACE_UTMI}; 


extern void usb_musb_init(struct omap_musb_board_data *board_data);



extern void usb_ehci_init(const struct usbhs_omap_board_data *pdata);



extern void usb_ohci_init(const struct usbhs_omap_board_data *pdata);



extern void usbhs_init(const struct usbhs_omap_board_data *pdata);



extern int omap_usbhs_enable(struct device *dev);