On Fri, Nov 09, 2012 at 11:27:32PM +0200, Felipe Balbi wrote:
> 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
Thanks for the merge resolution, that helped out. Now pulled and pushed
out.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
