+@@ -1701,7 +1701,7 @@ static int ftdi_submit_read_urb(struct u

+@@ -1165,7 +1165,6 @@ static int read_latency_timer(struct usb

+@@ -1178,8 +1177,9 @@ static int read_latency_timer(struct usb

+@@ -1565,7 +1565,8 @@ static int ftdi_sio_port_probe(struct us

+@@ -1533,8 +1533,7 @@ static int ftdi_sio_port_probe(struct us

+@@ -2227,12 +2227,10 @@ static void ftdi_set_termios(struct tty_

+From felipe.balbi@nokia.com Tue Dec 22 14:10:27 2009

+From: Felipe Balbi <felipe.balbi@nokia.com>

+Date: Tue, 15 Dec 2009 11:08:40 +0200

+Subject: USB: musb: get rid of musb->set_clock

+To: Greg Kroah-Hartman <gregkh@suse.de>

+Cc: David Brownell <david-b@pacbell.net>, Anand Gadiyar <gadiyar@ti.com>, Ajay Kumar Gupta <ajay.gupta@ti.com>, Arnaud Mandy <ext-arnaud.2.mandy@nokia.com>, Heikki Krogerus <ext-heikki.krogerus@nokia.com>, Felipe Balbi <felipe.balbi@nokia.com>

+Message-ID: <1260868125-4774-4-git-send-email-felipe.balbi@nokia.com>

+

+

+... and use clk framework functions only.

+

+Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>

+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+

+---

+ drivers/usb/musb/musb_core.c | 12 +++---------

+ drivers/usb/musb/musb_core.h | 2 --

+ drivers/usb/musb/omap2430.c | 10 ++--------

+ drivers/usb/musb/tusb6010.c | 16 ++++++----------

+ 4 files changed, 11 insertions(+), 29 deletions(-)

+

+--- a/drivers/usb/musb/musb_core.c

++++ b/drivers/usb/musb/musb_core.c

+@@ -1915,7 +1915,6 @@ bad_config:

+ spin_lock_init(&musb->lock);

+ musb->board_mode = plat->mode;

+ musb->board_set_power = plat->set_power;

+- musb->set_clock = plat->set_clock;

+ musb->min_power = plat->min_power;

+

+ /* Clock usage is chip-specific ... functional clock (DaVinci,

+@@ -2167,11 +2166,9 @@ static int musb_suspend(struct device *d

+ */

+ }

+

+- if (musb->set_clock)

+- musb->set_clock(musb->clock, 0);

+- else

+- clk_disable(musb->clock);

++ clk_disable(musb->clock);

+ spin_unlock_irqrestore(&musb->lock, flags);

++

+ return 0;

+ }

+

+@@ -2183,10 +2180,7 @@ static int musb_resume_noirq(struct devi

+ if (!musb->clock)

+ return 0;

+

+- if (musb->set_clock)

+- musb->set_clock(musb->clock, 1);

+- else

+- clk_enable(musb->clock);

++ clk_enable(musb->clock);

+

+ /* for static cmos like DaVinci, register values were preserved

+ * unless for some reason the whole soc powered down or the USB

+--- a/drivers/usb/musb/musb_core.h

++++ b/drivers/usb/musb/musb_core.h

+@@ -394,8 +394,6 @@ struct musb {

+ u8 board_mode; /* enum musb_mode */

+ int (*board_set_power)(int state);

+

+- int (*set_clock)(struct clk *clk, int is_active);

+-

+ u8 min_power; /* vbus for periph, in mA/2 */

+

+ bool is_host;

+--- a/drivers/usb/musb/omap2430.c

++++ b/drivers/usb/musb/omap2430.c

+@@ -273,10 +273,7 @@ int musb_platform_suspend(struct musb *m

+

+ otg_set_suspend(musb->xceiv, 1);

+

+- if (musb->set_clock)

+- musb->set_clock(musb->clock, 0);

+- else

+- clk_disable(musb->clock);

++ clk_disable(musb->clock);

+

+ return 0;

+ }

+@@ -290,10 +287,7 @@ static int musb_platform_resume(struct m

+

+ otg_set_suspend(musb->xceiv, 0);

+

+- if (musb->set_clock)

+- musb->set_clock(musb->clock, 1);

+- else

+- clk_enable(musb->clock);

++ clk_enable(musb->clock);

+

+ l = omap_readl(OTG_SYSCONFIG);

+ l &= ~ENABLEWAKEUP; /* disable wakeup */

+--- a/drivers/usb/musb/tusb6010.c

++++ b/drivers/usb/musb/tusb6010.c

+@@ -279,12 +279,10 @@ static int tusb_draw_power(struct otg_tr

+ * Keep clock active when enabled. Note that this is not tied to

+ * drawing VBUS, as with OTG mA can be less than musb->min_power.

+ */

+- if (musb->set_clock) {

+- if (mA)

+- musb->set_clock(musb->clock, 1);

+- else

+- musb->set_clock(musb->clock, 0);

+- }

++ if (mA)

++ clk_enable(musb->clock);

++ else

++ clk_disable(musb->clock);

+

+ /* tps65030 seems to consume max 100mA, with maybe 60mA available

+ * (measured on one board) for things other than tps and tusb.

+@@ -531,8 +529,7 @@ static void tusb_source_power(struct mus

+ devctl = musb_readb(musb->mregs, MUSB_DEVCTL);

+

+ if (is_on) {

+- if (musb->set_clock)

+- musb->set_clock(musb->clock, 1);

++ clk_enable(musb->clock);

+ timer = OTG_TIMER_MS(OTG_TIME_A_WAIT_VRISE);

+ musb->xceiv->default_a = 1;

+ musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;

+@@ -571,8 +568,7 @@ static void tusb_source_power(struct mus

+

+ devctl &= ~MUSB_DEVCTL_SESSION;

+ conf &= ~TUSB_DEV_CONF_USB_HOST_MODE;

+- if (musb->set_clock)

+- musb->set_clock(musb->clock, 0);

++ clk_disable(musb->clock);

+ }

+ prcm &= ~(TUSB_PRCM_MNGMT_15_SW_EN | TUSB_PRCM_MNGMT_33_SW_EN);

+

+From felipe.balbi@nokia.com Tue Dec 22 14:09:22 2009

+From: Felipe Balbi <felipe.balbi@nokia.com>

+Date: Tue, 15 Dec 2009 11:08:38 +0200

+Subject: USB: musb: move to sysfs_groups

+To: Greg Kroah-Hartman <gregkh@suse.de>

+Cc: David Brownell <david-b@pacbell.net>, Anand Gadiyar <gadiyar@ti.com>, Ajay Kumar Gupta <ajay.gupta@ti.com>, Arnaud Mandy <ext-arnaud.2.mandy@nokia.com>, Heikki Krogerus <ext-heikki.krogerus@nokia.com>, Felipe Balbi <felipe.balbi@nokia.com>

+Message-ID: <1260868125-4774-2-git-send-email-felipe.balbi@nokia.com>

+

+

+it's easier to keep up and add more sysfs entries

+as necessary.

+

+Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>

+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+

+---

+ drivers/usb/musb/musb_core.c | 33 +++++++++++++++------------------

+ 1 file changed, 15 insertions(+), 18 deletions(-)

+

+--- a/drivers/usb/musb/musb_core.c

++++ b/drivers/usb/musb/musb_core.c

+@@ -1759,6 +1759,19 @@ static DEVICE_ATTR(srp, 0644, NULL, musb

+

+ #endif /* CONFIG_USB_GADGET_MUSB_HDRC */

+

++static struct attribute *musb_attributes[] = {

++ &dev_attr_mode.attr,

++ &dev_attr_vbus.attr,

++#ifdef CONFIG_USB_GADGET_MUSB_HDRC

++ &dev_attr_srp.attr,

++#endif

++ NULL

++};

++

++static const struct attribute_group musb_attr_group = {

++ .attrs = musb_attributes,

++};

++

+ #endif /* sysfs */

+

+ /* Only used to provide driver mode change events */

+@@ -1833,11 +1846,7 @@ static void musb_free(struct musb *musb)

+ */

+

+ #ifdef CONFIG_SYSFS

+- device_remove_file(musb->controller, &dev_attr_mode);

+- device_remove_file(musb->controller, &dev_attr_vbus);

+-#ifdef CONFIG_USB_GADGET_MUSB_HDRC

+- device_remove_file(musb->controller, &dev_attr_srp);

+-#endif

++ sysfs_remove_group(&musb->controller->kobj, &musb_attr_group);

+ #endif

+

+ #ifdef CONFIG_USB_GADGET_MUSB_HDRC

+@@ -2079,12 +2088,7 @@ bad_config:

+ }

+

+ #ifdef CONFIG_SYSFS

+- status = device_create_file(dev, &dev_attr_mode);

+- status = device_create_file(dev, &dev_attr_vbus);

+-#ifdef CONFIG_USB_GADGET_MUSB_HDRC

+- status = device_create_file(dev, &dev_attr_srp);

+-#endif /* CONFIG_USB_GADGET_MUSB_HDRC */

+- status = 0;

++ status = sysfs_create_group(&musb->controller->kobj, &musb_attr_group);

+ #endif

+ if (status)

+ goto fail2;

+@@ -2092,13 +2096,6 @@ bad_config:

+ return 0;

+

+ fail2:

+-#ifdef CONFIG_SYSFS

+- device_remove_file(musb->controller, &dev_attr_mode);

+- device_remove_file(musb->controller, &dev_attr_vbus);

+-#ifdef CONFIG_USB_GADGET_MUSB_HDRC

+- device_remove_file(musb->controller, &dev_attr_srp);

+-#endif

+-#endif

+ musb_platform_exit(musb);

+ fail:

+ dev_err(musb->controller,

+From felipe.balbi@nokia.com Tue Dec 22 14:12:04 2009

+From: Felipe Balbi <felipe.balbi@nokia.com>

+Date: Tue, 15 Dec 2009 11:08:43 +0200

+Subject: USB: musb: move two printk to dev_err

+To: Greg Kroah-Hartman <gregkh@suse.de>

+Cc: David Brownell <david-b@pacbell.net>, Anand Gadiyar <gadiyar@ti.com>, Ajay Kumar Gupta <ajay.gupta@ti.com>, Arnaud Mandy <ext-arnaud.2.mandy@nokia.com>, Heikki Krogerus <ext-heikki.krogerus@nokia.com>, Felipe Balbi <felipe.balbi@nokia.com>

+Message-ID: <1260868125-4774-7-git-send-email-felipe.balbi@nokia.com>

+

+

+trivial cleanup, no functional changes.

+

+Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>

+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+

+---

+ drivers/usb/musb/musb_core.c | 4 ++--

+ 1 file changed, 2 insertions(+), 2 deletions(-)

+

+--- a/drivers/usb/musb/musb_core.c

++++ b/drivers/usb/musb/musb_core.c

+@@ -1696,7 +1696,7 @@ musb_vbus_store(struct device *dev, stru

+ unsigned long val;

+

+ if (sscanf(buf, "%lu", &val) < 1) {

+- printk(KERN_ERR "Invalid VBUS timeout ms value\n");

++ dev_err(dev, "Invalid VBUS timeout ms value\n");

+ return -EINVAL;

+ }

+

+@@ -1746,7 +1746,7 @@ musb_srp_store(struct device *dev, struc

+

+ if (sscanf(buf, "%hu", &srp) != 1

+ || (srp != 1)) {

+- printk(KERN_ERR "SRP: Value must be 1\n");

++ dev_err(dev, "SRP: Value must be 1\n");

+ return -EINVAL;

+ }

+

+From felipe.balbi@nokia.com Tue Dec 22 14:09:45 2009

+From: Felipe Balbi <felipe.balbi@nokia.com>

+Date: Tue, 15 Dec 2009 11:08:39 +0200

+Subject: USB: musb: remove some of the never defined defines

+To: Greg Kroah-Hartman <gregkh@suse.de>

+Cc: David Brownell <david-b@pacbell.net>, Anand Gadiyar <gadiyar@ti.com>, Ajay Kumar Gupta <ajay.gupta@ti.com>, Arnaud Mandy <ext-arnaud.2.mandy@nokia.com>, Heikki Krogerus <ext-heikki.krogerus@nokia.com>, Felipe Balbi <felipe.balbi@nokia.com>

+Message-ID: <1260868125-4774-3-git-send-email-felipe.balbi@nokia.com>

+

+

+just makes the musb init code a bit cleaner.

+

+Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>

+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+

+---

+ drivers/usb/musb/musb_core.c | 24 ------------------------

+ drivers/usb/musb/musb_core.h | 16 ++++------------

+ 2 files changed, 4 insertions(+), 36 deletions(-)

+

+--- a/drivers/usb/musb/musb_core.c

++++ b/drivers/usb/musb/musb_core.c

+@@ -1314,9 +1314,6 @@ enum { MUSB_CONTROLLER_MHDRC, MUSB_CONTR

+ */

+ static int __init musb_core_init(u16 musb_type, struct musb *musb)

+ {

+-#ifdef MUSB_AHB_ID

+- u32 data;

+-#endif

+ u8 reg;

+ char *type;

+ char aInfo[90], aRevision[32], aDate[12];

+@@ -1332,19 +1329,11 @@ static int __init musb_core_init(u16 mus

+ strcat(aInfo, ", dyn FIFOs");

+ if (reg & MUSB_CONFIGDATA_MPRXE) {

+ strcat(aInfo, ", bulk combine");

+-#ifdef C_MP_RX

+ musb->bulk_combine = true;

+-#else

+- strcat(aInfo, " (X)"); /* no driver support */

+-#endif

+ }

+ if (reg & MUSB_CONFIGDATA_MPTXE) {

+ strcat(aInfo, ", bulk split");

+-#ifdef C_MP_TX

+ musb->bulk_split = true;

+-#else

+- strcat(aInfo, " (X)"); /* no driver support */

+-#endif

+ }

+ if (reg & MUSB_CONFIGDATA_HBRXE) {

+ strcat(aInfo, ", HB-ISO Rx");

+@@ -1360,20 +1349,7 @@ static int __init musb_core_init(u16 mus

+ printk(KERN_DEBUG "%s: ConfigData=0x%02x (%s)\n",

+ musb_driver_name, reg, aInfo);

+

+-#ifdef MUSB_AHB_ID

+- data = musb_readl(mbase, 0x404);

+- sprintf(aDate, "%04d-%02x-%02x", (data & 0xffff),

+- (data >> 16) & 0xff, (data >> 24) & 0xff);

+- /* FIXME ID2 and ID3 are unused */

+- data = musb_readl(mbase, 0x408);

+- printk(KERN_DEBUG "ID2=%lx\n", (long unsigned)data);

+- data = musb_readl(mbase, 0x40c);

+- printk(KERN_DEBUG "ID3=%lx\n", (long unsigned)data);

+- reg = musb_readb(mbase, 0x400);

+- musb_type = ('M' == reg) ? MUSB_CONTROLLER_MHDRC : MUSB_CONTROLLER_HDRC;

+-#else

+ aDate[0] = 0;

+-#endif

+ if (MUSB_CONTROLLER_MHDRC == musb_type) {

+ musb->is_multipoint = 1;

+ type = "M";

+--- a/drivers/usb/musb/musb_core.h

++++ b/drivers/usb/musb/musb_core.h

+@@ -412,21 +412,13 @@ struct musb {

+ unsigned hb_iso_rx:1; /* high bandwidth iso rx? */

+ unsigned hb_iso_tx:1; /* high bandwidth iso tx? */

+

+-#ifdef C_MP_TX

+- unsigned bulk_split:1;

++ unsigned bulk_split:1;

+ #define can_bulk_split(musb,type) \

+- (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_split)

+-#else

+-#define can_bulk_split(musb, type) 0

+-#endif

++ (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_split)

+

+-#ifdef C_MP_RX

+- unsigned bulk_combine:1;

++ unsigned bulk_combine:1;

+ #define can_bulk_combine(musb,type) \

+- (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine)

+-#else

+-#define can_bulk_combine(musb, type) 0

+-#endif

++ (((type) == USB_ENDPOINT_XFER_BULK) && (musb)->bulk_combine)

+

+ #ifdef CONFIG_USB_GADGET_MUSB_HDRC

+ /* is_suspended means USB B_PERIPHERAL suspend */

+From felipe.balbi@nokia.com Tue Dec 22 14:11:34 2009

+From: Felipe Balbi <felipe.balbi@nokia.com>

+Date: Tue, 15 Dec 2009 11:08:42 +0200

+Subject: USB: musb: use resource_size()

+To: Greg Kroah-Hartman <gregkh@suse.de>

+Cc: David Brownell <david-b@pacbell.net>, Anand Gadiyar <gadiyar@ti.com>, Ajay Kumar Gupta <ajay.gupta@ti.com>, Arnaud Mandy <ext-arnaud.2.mandy@nokia.com>, Heikki Krogerus <ext-heikki.krogerus@nokia.com>, Felipe Balbi <felipe.balbi@nokia.com>

+Message-ID: <1260868125-4774-6-git-send-email-felipe.balbi@nokia.com>

+

+

+it makes ioremap() usage looks cleaner.

+

+Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>

+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+

+---

+ drivers/usb/musb/musb_core.c | 2 +-

+ 1 file changed, 1 insertion(+), 1 deletion(-)

+

+--- a/drivers/usb/musb/musb_core.c

++++ b/drivers/usb/musb/musb_core.c

+@@ -2134,7 +2134,7 @@ static int __init musb_probe(struct plat

+ if (!iomem || irq == 0)

+ return -ENODEV;

+

+- base = ioremap(iomem->start, iomem->end - iomem->start + 1);

++ base = ioremap(iomem->start, resource_size(iomem));

+ if (!base) {

+ dev_err(dev, "ioremap failed\n");

+ return -ENOMEM;