Hi Greg,
MUSB changes for v3.8 follow. This will conflict with your usb-next branch,
below you can find the resolution I used:
diff --cc drivers/usb/musb/musb_dsps.c
index ff5f112,e770f79..cf08966a
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@@ -458,14 -489,24 +489,24 @@@ static int __devinit dsps_create_musb_p
struct platform_device *musb;
struct resource *res;
struct resource resources[2];
- char res_name[10];
+ char res_name[11];
- int ret, musbid;
+ int ret;
- /* get memory resource */
- snprintf(res_name, sizeof(res_name), "musb%d", id);
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res_name);
+ resources[0].start = dsps_control_module_phys[id];
+ resources[0].end = resources[0].start + SZ_4 - 1;
+ resources[0].flags = IORESOURCE_MEM;
+
+ glue->usb_ctrl[id] = devm_request_and_ioremap(&pdev->dev, resources);
+ if (glue->usb_ctrl[id] == NULL) {
+ dev_err(dev, "Failed to obtain usb_ctrl%d memory\n", id);
+ ret = -ENODEV;
+ goto err0;
+ }
+
+ /* first resource is for usbss, so start index from 1 */
+ res = platform_get_resource(pdev, IORESOURCE_MEM, id + 1);
if (!res) {
- dev_err(dev, "%s get mem resource failed\n", res_name);
+ dev_err(dev, "failed to get memory for instance %d\n", id);
ret = -ENODEV;
goto err0;
}
The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:
Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/musb-for-v3.8
for you to fetch changes up to d928cd2ef8f7f4194e479d4a66452901ec82ccda:
usb: musb: dsps: document dt bindings properly (2012-11-09 08:02:08 +0200)
----------------------------------------------------------------
usb: musb: patches for v3.8 merge window
We have here the usual set of cleanups for the MUSB driver; a
big set of patches converting platform_device_del() and
platform_device_put() into platform_device_unregister().
Another big set was applied converting to module_platform_driver()
macro in order to reduce some boilerplate code from all glue
layers.
Other than that, we had a series fixing one known silicon errata
where we couldn't read a few registers. In order to fix that
we're now using shadow variables for reads and only writing
to the registers which are known to break functionality when
read.
----------------------------------------------------------------
Afzal Mohammed (5):
usb: musb: dsps: remove platform callback
usb: musb: dsps: reduce musb instance to one
usb: musb: dsps: get resources by index
Revert "usb: musb: dsps: remove explicit NOP device creation"
usb: musb: dsps: document dt bindings properly
Philippe De Swert (1):
usb: musb: remove generic_interrupt
Santhapuri, Damodar (1):
usb: musb: dsps: control module handling (quirk)
Sebastian Andrzej Siewior (5):
usb: musb: read MUSB_POWER register only when required.
usb: musb: avoid FADDR read access
usb: musb: Perform only write access on MUSB_INTRRXE
usb: musb: Perform only write access on MUSB_INTRTXE
usb: musb: remove hand-crafted id handling
Sergei Shtylyov (1):
usb: musb: cppi_dma: export cppi_interrupt()
Srinivas Kandagatla (6):
usb: musb: am35x: use module_platform_driver macro
usb: musb: blackfin: use module_platform_driver macro
usb: musb: da8xx: use module_platform_driver macro
usb: musb: davinci: use module_platform_driver macro
usb: musb: tusb6010: use module_platform_driver macro
usb: musb: ux500: use module_platform_driver macro
Wei Yongjun (7):
usb: musb: am35x: use platform_device_unregister in am35x_remove()
usb: musb: blackfin: use platform_device_unregister in bfin_remove()
usb: musb: da8xx: use platform_device_unregister in da8xx_remove()
usb: musb: davinci: use platform_device_unregister in davinci_remove()
usb: musb: dsps: use platform_device_unregister in dsps_delete_musb_pdev()
usb: musb: tusb6010: use platform_device_unregister in tusb_remove()
usb: musb: ux500: use platform_device_unregister in ux500_remove()
.../devicetree/bindings/usb/am33xx-usb.txt | 8 +-
drivers/usb/musb/am35x.c | 34 +-----
drivers/usb/musb/blackfin.c | 34 +-----
drivers/usb/musb/cppi_dma.c | 1 +
drivers/usb/musb/da8xx.c | 34 +-----
drivers/usb/musb/davinci.c | 34 +-----
drivers/usb/musb/musb_core.c | 96 ++++------------
drivers/usb/musb/musb_core.h | 5 +-
drivers/usb/musb/musb_dsps.c | 125 ++++++++++++---------
drivers/usb/musb/musb_gadget.c | 30 ++---
drivers/usb/musb/musb_gadget_ep0.c | 6 +-
drivers/usb/musb/musb_host.c | 2 +-
drivers/usb/musb/musbhsdma.h | 4 -
drivers/usb/musb/omap2430.c | 46 ++++----
drivers/usb/musb/tusb6010.c | 34 +-----
drivers/usb/musb/ux500.c | 56 +++++----
16 files changed, 192 insertions(+), 357 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
