[PATCH 4/4]usb : musb:USB driver using omap_device_build for device registration.

[PATCH 4/4]usb : musb:USB driver using omap_device_build for device registration.

[Hema HK]

From: Hema HK  <hemahk@ti.com>

Changed the musb driver to use omap_build_device api instead of 
platform_device_registration.The device specific resources defined in 
centralized database will be used. So removed the resource definitions from
the driver file. 

Signed-off-by: Hema HK <hemahk@ti.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>,tony@atomide.com
---
Based off  pm-wip/hwmods-omap4.

 arch/arm/mach-omap2/clock44xx_data.c       |    2 
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    2 
 arch/arm/mach-omap2/usb-musb.c             |   94 ++++++++++++++---------------
 3 files changed, 49 insertions(+), 49 deletions(-)

Index: linux-omap-pm/arch/arm/mach-omap2/clock44xx_data.c
===================================================================
--- linux-omap-pm.orig/arch/arm/mach-omap2/clock44xx_data.c
+++ linux-omap-pm/arch/arm/mach-omap2/clock44xx_data.c
@@ -2296,7 +2296,7 @@ static struct clk usb_host_fs_fck = {
 };
 
 static struct clk usb_otg_ick = {
-	.name		= "usb_otg_ick",
+	.name		= "usb_otg_hs_ick",
 	.ops		= &clkops_omap2_dflt,
 	.enable_reg	= OMAP4430_CM_L3INIT_USB_OTG_CLKCTRL,
 	.enable_bit	= OMAP4430_MODULEMODE_HWCTRL,
Index: linux-omap-pm/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
===================================================================
--- linux-omap-pm.orig/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ linux-omap-pm/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -4884,7 +4884,7 @@ static __initdata struct omap_hwmod *oma
 	/* usb_host_hs class */
 /*	&omap44xx_usb_host_hs_hwmod, */
 	/* usb_otg_hs class */
-/*	&omap44xx_usb_otg_hs_hwmod, */
+	&omap44xx_usb_otg_hs_hwmod,
 	/* usb_tll_hs class */
 /*	&omap44xx_usb_tll_hs_hwmod, */
 	/* wd_timer class */
Index: linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
===================================================================
--- linux-omap-pm.orig/arch/arm/mach-omap2/usb-musb.c
+++ linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
@@ -30,24 +30,12 @@
 #include <mach/irqs.h>
 #include <plat/mux.h>
 #include <plat/usb.h>
+#include <plat/omap_device.h>
 
 #ifdef CONFIG_USB_MUSB_SOC
 
-static struct resource musb_resources[] = {
-	[0] = { /* start and end set dynamically */
-		.flags	= IORESOURCE_MEM,
-	},
-	[1] = {	/* general IRQ */
-		.start	= INT_243X_HS_USB_MC,
-		.flags	= IORESOURCE_IRQ,
-		.name	= "mc",
-	},
-	[2] = {	/* DMA IRQ */
-		.start	= INT_243X_HS_USB_DMA,
-		.flags	= IORESOURCE_IRQ,
-		.name	= "dma",
-	},
-};
+static const char name[] = "musb_hdrc";
+#define MAX_OMAP_MUSB_HWMOD_NAME_LEN	16
 
 static struct musb_hdrc_config musb_config = {
 	.multipoint	= 1,
@@ -76,43 +64,55 @@ static struct musb_hdrc_platform_data mu
 
 static u64 musb_dmamask = DMA_BIT_MASK(32);
 
-static struct platform_device musb_device = {
-	.name		= "musb_hdrc",
-	.id		= -1,
-	.dev = {
-		.dma_mask		= &musb_dmamask,
-		.coherent_dma_mask	= DMA_BIT_MASK(32),
-		.platform_data		= &musb_plat,
+static struct omap_device_pm_latency omap_musb_latency[] = {
+	{
+		.deactivate_func = omap_device_idle_hwmods,
+		.activate_func	 = omap_device_enable_hwmods,
+		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
 	},
-	.num_resources	= ARRAY_SIZE(musb_resources),
-	.resource	= musb_resources,
 };
 
 void __init usb_musb_init(struct omap_musb_board_data *board_data)
 {
-	if (cpu_is_omap243x()) {
-		musb_resources[0].start = OMAP243X_HS_BASE;
-	} else if (cpu_is_omap34xx()) {
-		musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
-	} else if (cpu_is_omap44xx()) {
-		musb_resources[0].start = OMAP44XX_HSUSB_OTG_BASE;
-		musb_resources[1].start = OMAP44XX_IRQ_HS_USB_MC_N;
-		musb_resources[2].start = OMAP44XX_IRQ_HS_USB_DMA_N;
-	}
-	musb_resources[0].end = musb_resources[0].start + SZ_4K - 1;
-
-	/*
-	 * REVISIT: This line can be removed once all the platforms using
-	 * musb_core.c have been converted to use use clkdev.
-	 */
-	musb_plat.clock = "ick";
-	musb_plat.board_data = board_data;
-	musb_plat.power = board_data->power >> 1;
-	musb_plat.mode = board_data->mode;
-	musb_plat.extvbus = board_data->extvbus;
-
-	if (platform_device_register(&musb_device) < 0)
-		printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
+	char oh_name[MAX_OMAP_MUSB_HWMOD_NAME_LEN];
+	struct omap_hwmod *oh;
+	struct omap_device *od;
+	struct platform_device *pdev;
+	struct device	*dev;
+	int l, bus_id = -1;
+	struct musb_hdrc_platform_data *pdata;
+
+	l = snprintf(oh_name, MAX_OMAP_MUSB_HWMOD_NAME_LEN,
+						"usb_otg_hs");
+	WARN(l >= MAX_OMAP_MUSB_HWMOD_NAME_LEN,
+	"String buffer overflow in MUSB device setup\n");
+	oh = omap_hwmod_lookup(oh_name);
+	if (!oh) {
+		pr_err("Could not look up %s\n", oh_name);
+	} else {
+		musb_plat.clock = "ick";
+		musb_plat.board_data = board_data;
+		musb_plat.power = board_data->power >> 1;
+		musb_plat.mode = board_data->mode;
+		pdata = &musb_plat;
+
+		od = omap_device_build(name, bus_id, oh, pdata,
+				       sizeof(struct musb_hdrc_platform_data),
+							omap_musb_latency,
+				       ARRAY_SIZE(omap_musb_latency), false);
+		if (IS_ERR(od)) {
+			pr_err("Could not build omap_device for %s %s\n",
+						name, oh_name);
+		} else {
+
+			pdev = &od->pdev;
+			dev = &pdev->dev;
+			get_device(dev);
+			dev->dma_mask = &musb_dmamask;
+			dev->coherent_dma_mask = musb_dmamask;
+			put_device(dev);
+		}
+ 	}
 }
 
 #else

Re: [PATCH 4/4]usb : musb:USB driver using omap_device_build for device registration.

[Tony Lindgren]

* Hema HK <hemahk-l0cyMroinI0@public.gmane.org> [100628 15:12]:
> -
> -	/*
> -	 * REVISIT: This line can be removed once all the platforms using
> -	 * musb_core.c have been converted to use use clkdev.
> -	 */
> -	musb_plat.clock = "ick";

This comment is still valid, please don't remove it.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 4/4]usb : musb:USB driver using omap_device_build for device registration.

[Kalliguddi, Hema]

 

>-----Original Message-----
>From: Tony Lindgren [mailto:tony@atomide.com] 
>Sent: Monday, June 28, 2010 6:59 PM
>To: Kalliguddi, Hema
>Cc: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org; Felipe Balbi
>Subject: Re: [PATCH 4/4]usb : musb:USB driver using 
>omap_device_build for device registration.
>
>* Hema HK <hemahk@ti.com> [100628 15:12]:
>> -
>> -	/*
>> -	 * REVISIT: This line can be removed once all the 
>platforms using
>> -	 * musb_core.c have been converted to use use clkdev.
>> -	 */
>> -	musb_plat.clock = "ick";
>
>This comment is still valid, please don't remove it.
This is still there. It is moved below under else.

Regards,
Hema
>
>Regards,
>
>Tony
>

Re: [PATCH 4/4]usb : musb:USB driver using omap_device_build for device registration.

[Tony Lindgren]

* Kalliguddi, Hema <hemahk@ti.com> [100628 16:26]:
>  
> 
> >-----Original Message-----
> >From: Tony Lindgren [mailto:tony@atomide.com] 
> >Sent: Monday, June 28, 2010 6:59 PM
> >To: Kalliguddi, Hema
> >Cc: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org; Felipe Balbi
> >Subject: Re: [PATCH 4/4]usb : musb:USB driver using 
> >omap_device_build for device registration.
> >
> >* Hema HK <hemahk@ti.com> [100628 15:12]:
> >> -
> >> -	/*
> >> -	 * REVISIT: This line can be removed once all the 
> >platforms using
> >> -	 * musb_core.c have been converted to use use clkdev.
> >> -	 */
> >> -	musb_plat.clock = "ick";
> >
> >This comment is still valid, please don't remove it.
> This is still there. It is moved below under else.

Not in the patch you posted?

Tony

RE: [PATCH 4/4]usb : musb:USB driver using omap_device_build for device registration.

[Kalliguddi, Hema]

 

>-----Original Message-----
>From: Tony Lindgren [mailto:tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org] 
>Sent: Monday, June 28, 2010 7:12 PM
>To: Kalliguddi, Hema
>Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; Felipe Balbi
>Subject: Re: [PATCH 4/4]usb : musb:USB driver using 
>omap_device_build for device registration.
>
>* Kalliguddi, Hema <hemahk-l0cyMroinI0@public.gmane.org> [100628 16:26]:
>>  
>> 
>> >-----Original Message-----
>> >From: Tony Lindgren [mailto:tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org] 
>> >Sent: Monday, June 28, 2010 6:59 PM
>> >To: Kalliguddi, Hema
>> >Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; 
>Felipe Balbi
>> >Subject: Re: [PATCH 4/4]usb : musb:USB driver using 
>> >omap_device_build for device registration.
>> >
>> >* Hema HK <hemahk-l0cyMroinI0@public.gmane.org> [100628 15:12]:
>> >> -
>> >> -	/*
>> >> -	 * REVISIT: This line can be removed once all the 
>> >platforms using
>> >> -	 * musb_core.c have been converted to use use clkdev.
>> >> -	 */
>> >> -	musb_plat.clock = "ick";
>> >
>> >This comment is still valid, please don't remove it.
>> This is still there. It is moved below under else.
>
>Not in the patch you posted?
>

-	musb_plat.clock = "ick";
-	musb_plat.board_data = board_data;
-	musb_plat.power = board_data->power >> 1;
-	musb_plat.mode = board_data->mode;
-	musb_plat.extvbus = board_data->extvbus;
-
-	if (platform_device_register(&musb_device) < 0)
-		printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
+	char oh_name[MAX_OMAP_MUSB_HWMOD_NAME_LEN];
+	struct omap_hwmod *oh;
+	struct omap_device *od;
+	struct platform_device *pdev;
+	struct device	*dev;
+	int l, bus_id = -1;
+	struct musb_hdrc_platform_data *pdata;
+
+	l = snprintf(oh_name, MAX_OMAP_MUSB_HWMOD_NAME_LEN,
+						"usb_otg_hs");
+	WARN(l >= MAX_OMAP_MUSB_HWMOD_NAME_LEN,
+	"String buffer overflow in MUSB device setup\n");
+	oh = omap_hwmod_lookup(oh_name);
+	if (!oh) {
+		pr_err("Could not look up %s\n", oh_name);
+	} else {
+		musb_plat.clock = "ick";
+		musb_plat.board_data = board_data;
+		musb_plat.power = board_data->power >> 1;
+		musb_plat.mode = board_data->mode;
+		pdata = &musb_plat;

It is there in the patch I posted.only the comment is being removed. You are refering the comment also? 

Regards,
Hema
>Tony
>--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 4/4]usb : musb:USB driver using omap_device_build for device registration.

[Kalliguddi, Hema]

 

>-----Original Message-----
>From: linux-usb-owner@vger.kernel.org 
>[mailto:linux-usb-owner@vger.kernel.org] On Behalf Of Kalliguddi, Hema
>Sent: Monday, June 28, 2010 7:17 PM
>To: Tony Lindgren
>Cc: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org; Felipe Balbi
>Subject: RE: [PATCH 4/4]usb : musb:USB driver using 
>omap_device_build for device registration.
>
> 
>
>>-----Original Message-----
>>From: Tony Lindgren [mailto:tony@atomide.com] 
>>Sent: Monday, June 28, 2010 7:12 PM
>>To: Kalliguddi, Hema
>>Cc: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org; 
>Felipe Balbi
>>Subject: Re: [PATCH 4/4]usb : musb:USB driver using 
>>omap_device_build for device registration.
>>
>>* Kalliguddi, Hema <hemahk@ti.com> [100628 16:26]:
>>>  
>>> 
>>> >-----Original Message-----
>>> >From: Tony Lindgren [mailto:tony@atomide.com] 
>>> >Sent: Monday, June 28, 2010 6:59 PM
>>> >To: Kalliguddi, Hema
>>> >Cc: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org; 
>>Felipe Balbi
>>> >Subject: Re: [PATCH 4/4]usb : musb:USB driver using 
>>> >omap_device_build for device registration.
>>> >
>>> >* Hema HK <hemahk@ti.com> [100628 15:12]:
>>> >> -
>>> >> -	/*
>>> >> -	 * REVISIT: This line can be removed once all the 
>>> >platforms using
>>> >> -	 * musb_core.c have been converted to use use clkdev.
>>> >> -	 */
>>> >> -	musb_plat.clock = "ick";
>>> >
>>> >This comment is still valid, please don't remove it.
>>> This is still there. It is moved below under else.
>>
Yes. The comment is being removed in the patch I posted. I will keep it.
Regards,
Hema
>>Tony
>>--
>To unsubscribe from this list: send the line "unsubscribe linux-usb" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: [PATCH 4/4]usb : musb:USB driver using omap_device_build for device registration.

[Sergei Shtylyov]

Hello.

Hema HK wrote:

> From: Hema HK  <hemahk-l0cyMroinI0@public.gmane.org>

    I think the patch description has clarity issues...

> Changed the musb driver to use omap_build_device api instead of 

    I don't see where are you changing the MUSB driver.

> platform_device_registration.

    Why underscores here?

> The device specific resources defined in 
> centralized database will be used. So removed the resource definitions from
> the driver file.

    Do you mean usb-musb.c here? This is certainly not a driver.

> Signed-off-by: Hema HK <hemahk-l0cyMroinI0@public.gmane.org>
> Cc: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>,tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 4/4]usb : musb:USB driver using omap_device_build for device registration.

[Tony Lindgren]

* Kalliguddi, Hema <hemahk-l0cyMroinI0@public.gmane.org> [100628 16:52]:
>
> Yes. The comment is being removed in the patch I posted. I will keep it.

Thanks.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 4/4]usb : musb:USB driver using omap_device_build for device registration.

[Kalliguddi, Hema]

 Hello,

>-----Original Message-----
>From: Sergei Shtylyov [mailto:sshtylyov@mvista.com] 
>Sent: Tuesday, June 29, 2010 4:35 PM
>To: Kalliguddi, Hema
>Cc: linux-usb@vger.kernel.org; linux-omap@vger.kernel.org; 
>Felipe Balbi; tony@atomide.com
>Subject: Re: [PATCH 4/4]usb : musb:USB driver using 
>omap_device_build for device registration.
>
>Hello.
>
>Hema HK wrote:
>
>> From: Hema HK  <hemahk@ti.com>
>
>    I think the patch description has clarity issues...
>
>> Changed the musb driver to use omap_build_device api instead of 
>
>    I don't see where are you changing the MUSB driver.

There is function name mismatch in the description.it should be "omap_device_build" instead of omap_build_device.
The change is in usb-musb.c file. I agree that it is not a driver file.I will change the description appropriately.

>
>> platform_device_registration.
>
>    Why underscores here?
>
I intended to provide the API name here platform_device_register. I will correct it.

>> The device specific resources defined in 
>> centralized database will be used. So removed the resource 
>definitions from
>> the driver file.
>
>    Do you mean usb-musb.c here? This is certainly not a driver.
>
Agreed not a driver.

Regards,
Hema
>> Signed-off-by: Hema HK <hemahk@ti.com>
>> Cc: Felipe Balbi <felipe.balbi@nokia.com>,tony@atomide.com
>
>WBR, Sergei
>
>