* [PATCH V2 4/8]usb : musb:Using omap_device_build for musb device registration
@ 2010-08-06 15:57 Hema HK
2010-08-09 12:45 ` Cousson, Benoit
0 siblings, 1 reply; 3+ messages in thread
From: Hema HK @ 2010-08-06 15:57 UTC (permalink / raw)
To: linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-omap-u79uwXL29TY76Z2rM5mHXA
Cc: Hema HK, Felipe Balbi, Tony Lindgren, Kevin Hilman
From: Hema HK <hemahk-l0cyMroinI0@public.gmane.org>
Using omap_device_build api instead of platform_device_register for musb
device registration.The device specific resources defined in centralized
database will be used. So removed the resource definitions from the musb
platform file.
Signed-off-by: Hema HK <hemahk-l0cyMroinI0@public.gmane.org>
Cc: Felipe Balbi <felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
Cc: Kevin Hilman <khilman-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org>
---
arch/arm/mach-omap2/usb-musb.c | 100 +++++++++++++++++++++--------------------
1 file changed, 53 insertions(+), 47 deletions(-)
Index: linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
===================================================================
--- linux-omap-pm.orig/arch/arm/mach-omap2/usb-musb.c 2010-08-06 09:01:25.526112352 -0400
+++ linux-omap-pm/arch/arm/mach-omap2/usb-musb.c 2010-08-06 09:01:43.786112839 -0400
@@ -29,24 +29,12 @@
#include <mach/hardware.h>
#include <mach/irqs.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,
@@ -75,43 +63,61 @@
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,
- },
- .num_resources = ARRAY_SIZE(musb_resources),
- .resource = musb_resources,
+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,
+ },
};
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;
+ 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 {
+ /*
+ * 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;
+ 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);
+ }
}
- 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;
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH V2 4/8]usb : musb:Using omap_device_build for musb device registration
2010-08-06 15:57 [PATCH V2 4/8]usb : musb:Using omap_device_build for musb device registration Hema HK
@ 2010-08-09 12:45 ` Cousson, Benoit
[not found] ` <4C5FF856.4020301-l0cyMroinI0@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Cousson, Benoit @ 2010-08-09 12:45 UTC (permalink / raw)
To: Kalliguddi, Hema
Cc: linux-usb@vger.kernel.org, linux-omap@vger.kernel.org,
Felipe Balbi, Tony Lindgren, Kevin Hilman
On 8/6/2010 5:57 PM, Kalliguddi, Hema wrote:
> From: Hema HK<hemahk@ti.com>
<snip>
> 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;
> + 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");
This is not needed in your case. Just use a const char*, and you will
avoid the useless snprintf and test.
> +
> + oh = omap_hwmod_lookup(oh_name);
> +
> + if (!oh) {
> + pr_err("Could not look up %s\n", oh_name);
> + } else {
You can avoid that indentation be returning in case of failure.
> + /*
> + * 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;
> + 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 {
You can avoid that second level of indentation be returning in case of
failure as well.
Benoit
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-10 5:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-06 15:57 [PATCH V2 4/8]usb : musb:Using omap_device_build for musb device registration Hema HK
2010-08-09 12:45 ` Cousson, Benoit
[not found] ` <4C5FF856.4020301-l0cyMroinI0@public.gmane.org>
2010-08-10 5:03 ` Kalliguddi, Hema
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).