From: Vivek Gautam Date: Fri, 25 Jan 2013 11:22:01 +0000 (+0530) Subject: usb: dwc3: exynos/omap: Change platform device IDs for no_op_xceive to AUTO X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b0e45ddb96d5a972a8b76354f036b90549ae85b3;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git usb: dwc3: exynos/omap: Change platform device IDs for no_op_xceive to AUTO Multiple dwc3 probe calls try to allocate no_op_xceive platform device. Having static IDs for these will throw sysfs error -EEXIST. Changing these static platform device IDs to AUTO to enable multiple dwc3 controller support on a SoC. Signed-off-by: Vivek Gautam Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c index 1e955517c6fa..b50da53e9a52 100644 --- a/drivers/usb/dwc3/dwc3-exynos.c +++ b/drivers/usb/dwc3/dwc3-exynos.c @@ -42,7 +42,7 @@ static int dwc3_exynos_register_phys(struct dwc3_exynos *exynos) memset(&pdata, 0x00, sizeof(pdata)); - pdev = platform_device_alloc("nop_usb_xceiv", 0); + pdev = platform_device_alloc("nop_usb_xceiv", PLATFORM_DEVID_AUTO); if (!pdev) return -ENOMEM; @@ -53,7 +53,7 @@ static int dwc3_exynos_register_phys(struct dwc3_exynos *exynos) if (ret) goto err1; - pdev = platform_device_alloc("nop_usb_xceiv", 1); + pdev = platform_device_alloc("nop_usb_xceiv", PLATFORM_DEVID_AUTO); if (!pdev) { ret = -ENOMEM; goto err1; diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 831b75fa4386..22f337f57219 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -203,7 +203,7 @@ static int dwc3_omap_register_phys(struct dwc3_omap *omap) memset(&pdata, 0x00, sizeof(pdata)); - pdev = platform_device_alloc("nop_usb_xceiv", 0); + pdev = platform_device_alloc("nop_usb_xceiv", PLATFORM_DEVID_AUTO); if (!pdev) return -ENOMEM; @@ -214,7 +214,7 @@ static int dwc3_omap_register_phys(struct dwc3_omap *omap) if (ret) goto err1; - pdev = platform_device_alloc("nop_usb_xceiv", 1); + pdev = platform_device_alloc("nop_usb_xceiv", PLATFORM_DEVID_AUTO); if (!pdev) { ret = -ENOMEM; goto err1;