* [PATCH v2 0/2] usb: fix controller-PHY binding for OMAP3 platform @ 2013-12-06 12:06 Kishon Vijay Abraham I 2013-12-06 12:06 ` [PATCH v2 1/2] usb: musb: omap: remove using PLATFORM_DEVID_AUTO in omap2430.c Kishon Vijay Abraham I 2013-12-06 12:06 ` [PATCH v2 2/2] arm: omap: remove *.auto* from device names given in usb_bind_phy Kishon Vijay Abraham I 0 siblings, 2 replies; 8+ messages in thread From: Kishon Vijay Abraham I @ 2013-12-06 12:06 UTC (permalink / raw) To: tony-4v6yS6AI5VpBDgjK7y7TUQ, balbi-l0cyMroinI0, linux-kernel-u79uwXL29TY76Z2rM5mHXA, kishon-l0cyMroinI0 Cc: linux-lFZ/pmaqli7XmaaqVzeoHQ, gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r, linux-omap-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-usb-u79uwXL29TY76Z2rM5mHXA After the platform devices are created using PLATFORM_DEVID_AUTO, the device names given in usb_bind_phy (in board file) does not match with the actual device name causing the USB PHY library not to return the PHY reference when the MUSB controller request for the PHY in the non-dt boot case. So removed creating platform devices using PLATFORM_DEVID_AUTO in omap2430.c. Changes from v1: * refreshed to the latested mainline kernel * added musb_put_id from omap2430 remove. Kishon Vijay Abraham I (2): usb: musb: omap: remove using PLATFORM_DEVID_AUTO in omap2430.c arm: omap: remove *.auto* from device names given in usb_bind_phy arch/arm/mach-omap2/board-2430sdp.c | 2 +- arch/arm/mach-omap2/board-3430sdp.c | 2 +- arch/arm/mach-omap2/board-cm-t35.c | 2 +- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/board-ldp.c | 2 +- arch/arm/mach-omap2/board-omap3beagle.c | 2 +- arch/arm/mach-omap2/board-omap3logic.c | 2 +- arch/arm/mach-omap2/board-omap3pandora.c | 2 +- arch/arm/mach-omap2/board-omap3stalker.c | 2 +- arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- arch/arm/mach-omap2/board-overo.c | 2 +- arch/arm/mach-omap2/board-rx51.c | 2 +- drivers/usb/musb/musb_core.c | 31 +++++++++++++++++++++++++++- drivers/usb/musb/musb_core.h | 2 ++ drivers/usb/musb/omap2430.c | 19 +++++++++++++++-- 15 files changed, 61 insertions(+), 15 deletions(-) -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/2] usb: musb: omap: remove using PLATFORM_DEVID_AUTO in omap2430.c 2013-12-06 12:06 [PATCH v2 0/2] usb: fix controller-PHY binding for OMAP3 platform Kishon Vijay Abraham I @ 2013-12-06 12:06 ` Kishon Vijay Abraham I 2013-12-06 12:06 ` [PATCH v2 2/2] arm: omap: remove *.auto* from device names given in usb_bind_phy Kishon Vijay Abraham I 1 sibling, 0 replies; 8+ messages in thread From: Kishon Vijay Abraham I @ 2013-12-06 12:06 UTC (permalink / raw) To: tony, balbi, linux-kernel, kishon Cc: gregkh, linux-omap, linux, linux-usb, linux-arm-kernel After the platform devices are created using PLATFORM_DEVID_AUTO, the device names given in usb_bind_phy (in board file) does not match with the actual device name causing the USB PHY library not to return the PHY reference when the MUSB controller request for the PHY in the non-dt boot case. So removed creating platform devices using PLATFORM_DEVID_AUTO in omap2430.c. This is also needed for the Generic PHY Framework. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- drivers/usb/musb/musb_core.c | 31 ++++++++++++++++++++++++++++++- drivers/usb/musb/musb_core.h | 2 ++ drivers/usb/musb/omap2430.c | 19 +++++++++++++++++-- 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 0a43329..aaf734c 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -94,6 +94,7 @@ #include <linux/sched.h> #include <linux/slab.h> #include <linux/init.h> +#include <linux/idr.h> #include <linux/list.h> #include <linux/kobject.h> #include <linux/prefetch.h> @@ -120,7 +121,7 @@ MODULE_DESCRIPTION(DRIVER_INFO); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:" MUSB_DRIVER_NAME); - +static DEFINE_IDA(musb_ida); /*-------------------------------------------------------------------------*/ @@ -131,6 +132,34 @@ static inline struct musb *dev_to_musb(struct device *dev) /*-------------------------------------------------------------------------*/ +int musb_get_id(struct device *dev, gfp_t gfp_mask) +{ + int ret; + int id; + + ret = ida_pre_get(&musb_ida, gfp_mask); + if (!ret) { + dev_err(dev, "failed to reserve resource for id\n"); + return -ENOMEM; + } + + ret = ida_get_new(&musb_ida, &id); + if (ret < 0) { + dev_err(dev, "failed to allocate a new id\n"); + return ret; + } + + return id; +} +EXPORT_SYMBOL_GPL(musb_get_id); + +void musb_put_id(struct device *dev, int id) +{ + dev_dbg(dev, "removing id %d\n", id); + ida_remove(&musb_ida, id); +} +EXPORT_SYMBOL_GPL(musb_put_id); + #ifndef CONFIG_BLACKFIN static int musb_ulpi_read(struct usb_phy *phy, u32 offset) { diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 29f7cd7..63614283 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -506,6 +506,8 @@ extern const char musb_driver_name[]; extern void musb_stop(struct musb *musb); extern void musb_start(struct musb *musb); +int musb_get_id(struct device *dev, gfp_t gfp_mask); +void musb_put_id(struct device *dev, int id); extern void musb_write_fifo(struct musb_hw_ep *ep, u16 len, const u8 *src); extern void musb_read_fifo(struct musb_hw_ep *ep, u16 len, u8 *dst); diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 2a408cd..14a612c 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -45,6 +45,7 @@ struct omap2430_glue { struct device *dev; + int id; struct platform_device *musb; enum omap_musb_vbus_id_status status; struct work_struct omap_musb_mailbox_work; @@ -508,6 +509,7 @@ static int omap2430_probe(struct platform_device *pdev) struct device_node *np = pdev->dev.of_node; struct musb_hdrc_config *config; int ret = -ENOMEM; + int musbid; glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL); if (!glue) { @@ -515,10 +517,18 @@ static int omap2430_probe(struct platform_device *pdev) goto err0; } - musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO); + /* get the musb id */ + musbid = musb_get_id(&pdev->dev, GFP_KERNEL); + if (musbid < 0) { + dev_err(&pdev->dev, "failed to allocate musb id\n"); + ret = -ENOMEM; + goto err0; + } + + musb = platform_device_alloc("musb-hdrc", musbid); if (!musb) { dev_err(&pdev->dev, "failed to allocate musb device\n"); - goto err0; + goto err1; } musb->dev.parent = &pdev->dev; @@ -528,6 +538,7 @@ static int omap2430_probe(struct platform_device *pdev) glue->dev = &pdev->dev; glue->musb = musb; glue->status = OMAP_MUSB_UNKNOWN; + glue->id = musbid; glue->control_otghs = ERR_PTR(-ENODEV); if (np) { @@ -633,6 +644,9 @@ static int omap2430_probe(struct platform_device *pdev) err2: platform_device_put(musb); +err1: + musb_put_id(&pdev->dev, musbid); + err0: return ret; } @@ -643,6 +657,7 @@ static int omap2430_remove(struct platform_device *pdev) cancel_work_sync(&glue->omap_musb_mailbox_work); platform_device_unregister(glue->musb); + musb_put_id(&pdev->dev, glue->id); return 0; } -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/2] arm: omap: remove *.auto* from device names given in usb_bind_phy 2013-12-06 12:06 [PATCH v2 0/2] usb: fix controller-PHY binding for OMAP3 platform Kishon Vijay Abraham I 2013-12-06 12:06 ` [PATCH v2 1/2] usb: musb: omap: remove using PLATFORM_DEVID_AUTO in omap2430.c Kishon Vijay Abraham I @ 2013-12-06 12:06 ` Kishon Vijay Abraham I 2013-12-06 12:14 ` Javier Martinez Canillas 1 sibling, 1 reply; 8+ messages in thread From: Kishon Vijay Abraham I @ 2013-12-06 12:06 UTC (permalink / raw) To: tony, balbi, linux-kernel, kishon Cc: linux, gregkh, linux-omap, linux-arm-kernel, linux-usb Previously MUSB wrapper (OMAP) device used PLATFORM_DEVID_AUTO while creating MUSB core device. So in usb_bind_phy (binds the controller with the PHY), the device name of the controller had *.auto* in it. Since with using PLATFORM_DEVID_AUTO, there is no way to know the exact device name in advance, the data given in usb_bind_phy became obsolete and usb_get_phy was failing. So MUSB wrapper was modified not to use PLATFORM_DEVID_AUTO. Corresponding change is done in board file here. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- arch/arm/mach-omap2/board-2430sdp.c | 2 +- arch/arm/mach-omap2/board-3430sdp.c | 2 +- arch/arm/mach-omap2/board-cm-t35.c | 2 +- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/board-ldp.c | 2 +- arch/arm/mach-omap2/board-omap3beagle.c | 2 +- arch/arm/mach-omap2/board-omap3logic.c | 2 +- arch/arm/mach-omap2/board-omap3pandora.c | 2 +- arch/arm/mach-omap2/board-omap3stalker.c | 2 +- arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- arch/arm/mach-omap2/board-overo.c | 2 +- arch/arm/mach-omap2/board-rx51.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index c711ad6..cc679c6 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c @@ -246,7 +246,7 @@ static void __init omap_2430sdp_init(void) omap_hsmmc_init(mmc); omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); + usb_bind_phy("musb-hdrc.0", 0, "twl4030_usb"); usb_musb_init(NULL); board_smc91x_init(); diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index d95d0ef..873e463 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -607,7 +607,7 @@ static void __init omap_3430sdp_init(void) omap_ads7846_init(1, gpio_pendown, 310, NULL); omap_serial_init(); omap_sdrc_init(hyb18m512160af6_sdrc_params, NULL); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); + usb_bind_phy("musb-hdrc.0", 0, "twl4030_usb"); usb_musb_init(NULL); board_smc91x_init(); board_flash_init(sdp_flash_partitions, chip_sel_3430, 0); diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index 8dd0ec8..ddcadfa 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c @@ -725,7 +725,7 @@ static void __init cm_t3x_common_init(void) cm_t35_init_display(); omap_twl4030_audio_init("cm-t3x", NULL); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); + usb_bind_phy("musb-hdrc.0", 0, "twl4030_usb"); usb_musb_init(NULL); cm_t35_init_usbh(); cm_t35_init_camera(); diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index cdc4fb9..bb589f1 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -628,7 +628,7 @@ static void __init devkit8000_init(void) omap_ads7846_init(2, OMAP3_DEVKIT_TS_GPIO, 0, NULL); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); + usb_bind_phy("musb-hdrc.0", 0, "twl4030_usb"); usb_musb_init(NULL); usbhs_init(&usbhs_bdata); board_nand_init(devkit8000_nand_partitions, diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 4ec8d82..ec9b349 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -402,7 +402,7 @@ static void __init omap_ldp_init(void) omap_ads7846_init(1, 54, 310, NULL); omap_serial_init(); omap_sdrc_init(NULL, NULL); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); + usb_bind_phy("musb-hdrc.0", 0, "twl4030_usb"); usb_musb_init(NULL); board_nand_init(ldp_nand_partitions, ARRAY_SIZE(ldp_nand_partitions), 0, 0, nand_default_timings); diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index d6ed819..0cba5eb 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -561,7 +561,7 @@ static void __init omap3_beagle_init(void) omap_sdrc_init(mt46h32m32lf6_sdrc_params, mt46h32m32lf6_sdrc_params); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); + usb_bind_phy("musb-hdrc.0", 0, "twl4030_usb"); usb_musb_init(NULL); usbhs_init(&usbhs_bdata); diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index bab51e6..d9a6c38 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c @@ -216,7 +216,7 @@ static void __init omap3logic_init(void) board_mmc_init(); board_smsc911x_init(); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); + usb_bind_phy("musb-hdrc.0", 0, "twl4030_usb"); usb_musb_init(NULL); /* Ensure SDRC pins are mux'd for self-refresh */ diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index de1bc6b..3826af6 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -607,7 +607,7 @@ static void __init omap3pandora_init(void) usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data)); usbhs_init(&usbhs_bdata); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); + usb_bind_phy("musb-hdrc.0", 0, "twl4030_usb"); usb_musb_init(NULL); gpmc_nand_init(&pandora_nand_data, NULL); diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 119efaf..9421987 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c @@ -407,7 +407,7 @@ static void __init omap3_stalker_init(void) omap_serial_init(); omap_sdrc_init(mt46h32m32lf6_sdrc_params, NULL); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); + usb_bind_phy("musb-hdrc.0", 0, "twl4030_usb"); usb_musb_init(NULL); usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data)); diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 7da48bc..e8e053d 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c @@ -367,7 +367,7 @@ static void __init omap3_touchbook_init(void) /* Touchscreen and accelerometer */ omap_ads7846_init(4, OMAP3_TS_GPIO, 310, &ads7846_pdata); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); + usb_bind_phy("musb-hdrc.0", 0, "twl4030_usb"); usb_musb_init(NULL); usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data)); diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index f6d3841..c69e049 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -511,7 +511,7 @@ static void __init overo_init(void) mt46h32m32lf6_sdrc_params); board_nand_init(overo_nand_partitions, ARRAY_SIZE(overo_nand_partitions), NAND_CS, 0, NULL); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); + usb_bind_phy("musb-hdrc.0", 0, "twl4030_usb"); usb_musb_init(NULL); usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data)); diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index db168c9..31d218f 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c @@ -103,7 +103,7 @@ static void __init rx51_init(void) sdrc_params = nokia_get_sdram_timings(); omap_sdrc_init(sdrc_params, sdrc_params); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); + usb_bind_phy("musb-hdrc.0", 0, "twl4030_usb"); usb_musb_init(&musb_board_data); rx51_peripherals_init(); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] arm: omap: remove *.auto* from device names given in usb_bind_phy 2013-12-06 12:06 ` [PATCH v2 2/2] arm: omap: remove *.auto* from device names given in usb_bind_phy Kishon Vijay Abraham I @ 2013-12-06 12:14 ` Javier Martinez Canillas 2013-12-06 21:08 ` Felipe Balbi 0 siblings, 1 reply; 8+ messages in thread From: Javier Martinez Canillas @ 2013-12-06 12:14 UTC (permalink / raw) To: Kishon Vijay Abraham I Cc: Tony Lindgren, Felipe Balbi, Linux Kernel, Russell King, Greg Kroah-Hartman, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-usb Hi Kishon, On Fri, Dec 6, 2013 at 1:06 PM, Kishon Vijay Abraham I <kishon@ti.com> wrote: > Previously MUSB wrapper (OMAP) device used PLATFORM_DEVID_AUTO while creating > MUSB core device. So in usb_bind_phy (binds the controller with the PHY), the > device name of the controller had *.auto* in it. Since with using > PLATFORM_DEVID_AUTO, there is no way to know the exact device name in advance, > the data given in usb_bind_phy became obsolete and usb_get_phy was failing. > So MUSB wrapper was modified not to use PLATFORM_DEVID_AUTO. Corresponding > change is done in board file here. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > arch/arm/mach-omap2/board-2430sdp.c | 2 +- > arch/arm/mach-omap2/board-3430sdp.c | 2 +- > arch/arm/mach-omap2/board-cm-t35.c | 2 +- > arch/arm/mach-omap2/board-devkit8000.c | 2 +- > arch/arm/mach-omap2/board-ldp.c | 2 +- > arch/arm/mach-omap2/board-omap3beagle.c | 2 +- > arch/arm/mach-omap2/board-omap3logic.c | 2 +- > arch/arm/mach-omap2/board-omap3pandora.c | 2 +- > arch/arm/mach-omap2/board-omap3stalker.c | 2 +- > arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- > arch/arm/mach-omap2/board-overo.c | 2 +- > arch/arm/mach-omap2/board-rx51.c | 2 +- > 12 files changed, 12 insertions(+), 12 deletions(-) > You can drop this patch since boards files are being removed for v3.14 Thanks a lot and best regards, Javier ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] arm: omap: remove *.auto* from device names given in usb_bind_phy 2013-12-06 12:14 ` Javier Martinez Canillas @ 2013-12-06 21:08 ` Felipe Balbi 2013-12-09 6:07 ` Kishon Vijay Abraham I 0 siblings, 1 reply; 8+ messages in thread From: Felipe Balbi @ 2013-12-06 21:08 UTC (permalink / raw) To: Javier Martinez Canillas Cc: Kishon Vijay Abraham I, Tony Lindgren, Felipe Balbi, Linux Kernel, Russell King, Greg Kroah-Hartman, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-usb [-- Attachment #1: Type: text/plain, Size: 1747 bytes --] Hi, On Fri, Dec 06, 2013 at 01:14:38PM +0100, Javier Martinez Canillas wrote: > On Fri, Dec 6, 2013 at 1:06 PM, Kishon Vijay Abraham I <kishon@ti.com> wrote: > > Previously MUSB wrapper (OMAP) device used PLATFORM_DEVID_AUTO while creating > > MUSB core device. So in usb_bind_phy (binds the controller with the PHY), the > > device name of the controller had *.auto* in it. Since with using > > PLATFORM_DEVID_AUTO, there is no way to know the exact device name in advance, > > the data given in usb_bind_phy became obsolete and usb_get_phy was failing. > > So MUSB wrapper was modified not to use PLATFORM_DEVID_AUTO. Corresponding > > change is done in board file here. > > > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > > --- > > arch/arm/mach-omap2/board-2430sdp.c | 2 +- > > arch/arm/mach-omap2/board-3430sdp.c | 2 +- > > arch/arm/mach-omap2/board-cm-t35.c | 2 +- > > arch/arm/mach-omap2/board-devkit8000.c | 2 +- > > arch/arm/mach-omap2/board-ldp.c | 2 +- > > arch/arm/mach-omap2/board-omap3beagle.c | 2 +- > > arch/arm/mach-omap2/board-omap3logic.c | 2 +- > > arch/arm/mach-omap2/board-omap3pandora.c | 2 +- > > arch/arm/mach-omap2/board-omap3stalker.c | 2 +- > > arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- > > arch/arm/mach-omap2/board-overo.c | 2 +- > > arch/arm/mach-omap2/board-rx51.c | 2 +- > > 12 files changed, 12 insertions(+), 12 deletions(-) > > > > You can drop this patch since boards files are being removed for v3.14 if we can drop this patch, the whole series is invalid, since we'll be using DT phandles to find PHYs going forward, no ? -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] arm: omap: remove *.auto* from device names given in usb_bind_phy 2013-12-06 21:08 ` Felipe Balbi @ 2013-12-09 6:07 ` Kishon Vijay Abraham I [not found] ` <52A55E2C.7070500-l0cyMroinI0@public.gmane.org> 0 siblings, 1 reply; 8+ messages in thread From: Kishon Vijay Abraham I @ 2013-12-09 6:07 UTC (permalink / raw) To: balbi, Tony Lindgren, Linux Kernel Cc: Russell King, Greg Kroah-Hartman, linux-usb, Javier Martinez Canillas, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Hi, On Saturday 07 December 2013 02:38 AM, Felipe Balbi wrote: > Hi, > > On Fri, Dec 06, 2013 at 01:14:38PM +0100, Javier Martinez Canillas wrote: >> On Fri, Dec 6, 2013 at 1:06 PM, Kishon Vijay Abraham I <kishon@ti.com> wrote: >>> Previously MUSB wrapper (OMAP) device used PLATFORM_DEVID_AUTO while creating >>> MUSB core device. So in usb_bind_phy (binds the controller with the PHY), the >>> device name of the controller had *.auto* in it. Since with using >>> PLATFORM_DEVID_AUTO, there is no way to know the exact device name in advance, >>> the data given in usb_bind_phy became obsolete and usb_get_phy was failing. >>> So MUSB wrapper was modified not to use PLATFORM_DEVID_AUTO. Corresponding >>> change is done in board file here. >>> >>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >>> --- >>> arch/arm/mach-omap2/board-2430sdp.c | 2 +- >>> arch/arm/mach-omap2/board-3430sdp.c | 2 +- >>> arch/arm/mach-omap2/board-cm-t35.c | 2 +- >>> arch/arm/mach-omap2/board-devkit8000.c | 2 +- >>> arch/arm/mach-omap2/board-ldp.c | 2 +- >>> arch/arm/mach-omap2/board-omap3beagle.c | 2 +- >>> arch/arm/mach-omap2/board-omap3logic.c | 2 +- >>> arch/arm/mach-omap2/board-omap3pandora.c | 2 +- >>> arch/arm/mach-omap2/board-omap3stalker.c | 2 +- >>> arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- >>> arch/arm/mach-omap2/board-overo.c | 2 +- >>> arch/arm/mach-omap2/board-rx51.c | 2 +- >>> 12 files changed, 12 insertions(+), 12 deletions(-) >>> >> >> You can drop this patch since boards files are being removed for v3.14 > > if we can drop this patch, the whole series is invalid, since we'll be > using DT phandles to find PHYs going forward, no ? > yeah. But in one of the other threads, Tony seemed ok to take a patch that fixes the same issue in mach-omap2/twl-common.c. So it's better to confirm with Tony. Thanks Kishon ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <52A55E2C.7070500-l0cyMroinI0@public.gmane.org>]
* Re: [PATCH v2 2/2] arm: omap: remove *.auto* from device names given in usb_bind_phy [not found] ` <52A55E2C.7070500-l0cyMroinI0@public.gmane.org> @ 2013-12-09 11:50 ` Javier Martinez Canillas 2013-12-09 17:40 ` Tony Lindgren 0 siblings, 1 reply; 8+ messages in thread From: Javier Martinez Canillas @ 2013-12-09 11:50 UTC (permalink / raw) To: Kishon Vijay Abraham I Cc: Felipe Balbi, Tony Lindgren, Linux Kernel, Russell King, Greg Kroah-Hartman, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-usb-u79uwXL29TY76Z2rM5mHXA Hi Kishon, On Mon, Dec 9, 2013 at 7:07 AM, Kishon Vijay Abraham I <kishon-l0cyMroinI0@public.gmane.org> wrote: > Hi, > > > On Saturday 07 December 2013 02:38 AM, Felipe Balbi wrote: >> >> Hi, >> >> On Fri, Dec 06, 2013 at 01:14:38PM +0100, Javier Martinez Canillas wrote: >>> >>> On Fri, Dec 6, 2013 at 1:06 PM, Kishon Vijay Abraham I <kishon-l0cyMroinI0@public.gmane.org> >>> wrote: >>>> >>>> Previously MUSB wrapper (OMAP) device used PLATFORM_DEVID_AUTO while >>>> creating >>>> MUSB core device. So in usb_bind_phy (binds the controller with the >>>> PHY), the >>>> device name of the controller had *.auto* in it. Since with using >>>> PLATFORM_DEVID_AUTO, there is no way to know the exact device name in >>>> advance, >>>> the data given in usb_bind_phy became obsolete and usb_get_phy was >>>> failing. >>>> So MUSB wrapper was modified not to use PLATFORM_DEVID_AUTO. >>>> Corresponding >>>> change is done in board file here. >>>> >>>> Signed-off-by: Kishon Vijay Abraham I <kishon-l0cyMroinI0@public.gmane.org> >>>> --- >>>> arch/arm/mach-omap2/board-2430sdp.c | 2 +- >>>> arch/arm/mach-omap2/board-3430sdp.c | 2 +- >>>> arch/arm/mach-omap2/board-cm-t35.c | 2 +- >>>> arch/arm/mach-omap2/board-devkit8000.c | 2 +- >>>> arch/arm/mach-omap2/board-ldp.c | 2 +- >>>> arch/arm/mach-omap2/board-omap3beagle.c | 2 +- >>>> arch/arm/mach-omap2/board-omap3logic.c | 2 +- >>>> arch/arm/mach-omap2/board-omap3pandora.c | 2 +- >>>> arch/arm/mach-omap2/board-omap3stalker.c | 2 +- >>>> arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- >>>> arch/arm/mach-omap2/board-overo.c | 2 +- >>>> arch/arm/mach-omap2/board-rx51.c | 2 +- >>>> 12 files changed, 12 insertions(+), 12 deletions(-) >>>> >>> >>> You can drop this patch since boards files are being removed for v3.14 >> >> >> if we can drop this patch, the whole series is invalid, since we'll be >> using DT phandles to find PHYs going forward, no ? >> > yeah. But in one of the other threads, Tony seemed ok to take a patch that > fixes the same issue in mach-omap2/twl-common.c. So it's better to confirm > with Tony. > Yes, I just read the other thread ("[PATCH] omap: twl-common: Fix musb-hdrc device name") and I see that these patches are fixing a v3.13 regression and are meant for the -rc cycle and not for v3.14. Sorry for the noise then. Best regards, Javier > Thanks > Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] arm: omap: remove *.auto* from device names given in usb_bind_phy 2013-12-09 11:50 ` Javier Martinez Canillas @ 2013-12-09 17:40 ` Tony Lindgren 0 siblings, 0 replies; 8+ messages in thread From: Tony Lindgren @ 2013-12-09 17:40 UTC (permalink / raw) To: Javier Martinez Canillas Cc: Kishon Vijay Abraham I, Felipe Balbi, Linux Kernel, Russell King, Greg Kroah-Hartman, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-usb * Javier Martinez Canillas <javier@dowhile0.org> [131209 03:51]: > Hi Kishon, > > On Mon, Dec 9, 2013 at 7:07 AM, Kishon Vijay Abraham I <kishon@ti.com> wrote: > > Hi, > > > > > > On Saturday 07 December 2013 02:38 AM, Felipe Balbi wrote: > >> > >> Hi, > >> > >> On Fri, Dec 06, 2013 at 01:14:38PM +0100, Javier Martinez Canillas wrote: > >>> > >>> On Fri, Dec 6, 2013 at 1:06 PM, Kishon Vijay Abraham I <kishon@ti.com> > >>> wrote: > >>>> > >>>> Previously MUSB wrapper (OMAP) device used PLATFORM_DEVID_AUTO while > >>>> creating > >>>> MUSB core device. So in usb_bind_phy (binds the controller with the > >>>> PHY), the > >>>> device name of the controller had *.auto* in it. Since with using > >>>> PLATFORM_DEVID_AUTO, there is no way to know the exact device name in > >>>> advance, > >>>> the data given in usb_bind_phy became obsolete and usb_get_phy was > >>>> failing. > >>>> So MUSB wrapper was modified not to use PLATFORM_DEVID_AUTO. > >>>> Corresponding > >>>> change is done in board file here. > >>>> > >>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > >>>> --- > >>>> arch/arm/mach-omap2/board-2430sdp.c | 2 +- > >>>> arch/arm/mach-omap2/board-3430sdp.c | 2 +- > >>>> arch/arm/mach-omap2/board-cm-t35.c | 2 +- > >>>> arch/arm/mach-omap2/board-devkit8000.c | 2 +- > >>>> arch/arm/mach-omap2/board-ldp.c | 2 +- > >>>> arch/arm/mach-omap2/board-omap3beagle.c | 2 +- > >>>> arch/arm/mach-omap2/board-omap3logic.c | 2 +- > >>>> arch/arm/mach-omap2/board-omap3pandora.c | 2 +- > >>>> arch/arm/mach-omap2/board-omap3stalker.c | 2 +- > >>>> arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- > >>>> arch/arm/mach-omap2/board-overo.c | 2 +- > >>>> arch/arm/mach-omap2/board-rx51.c | 2 +- > >>>> 12 files changed, 12 insertions(+), 12 deletions(-) > >>>> > >>> > >>> You can drop this patch since boards files are being removed for v3.14 > >> > >> > >> if we can drop this patch, the whole series is invalid, since we'll be > >> using DT phandles to find PHYs going forward, no ? > >> > > yeah. But in one of the other threads, Tony seemed ok to take a patch that > > fixes the same issue in mach-omap2/twl-common.c. So it's better to confirm > > with Tony. > > > > Yes, I just read the other thread ("[PATCH] omap: twl-common: Fix > musb-hdrc device name") and I see that these patches are fixing a > v3.13 regression and are meant for the -rc cycle and not for v3.14. Sorry guys, I'm a bit lost with these USB regression fixes. Which regression fix do we need for v3.13-rc series? If there's an option, I'd rather not touch all the board-*.c files as those are about to get dropped for v3.14. Regards, Tony ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-12-09 17:40 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-06 12:06 [PATCH v2 0/2] usb: fix controller-PHY binding for OMAP3 platform Kishon Vijay Abraham I
2013-12-06 12:06 ` [PATCH v2 1/2] usb: musb: omap: remove using PLATFORM_DEVID_AUTO in omap2430.c Kishon Vijay Abraham I
2013-12-06 12:06 ` [PATCH v2 2/2] arm: omap: remove *.auto* from device names given in usb_bind_phy Kishon Vijay Abraham I
2013-12-06 12:14 ` Javier Martinez Canillas
2013-12-06 21:08 ` Felipe Balbi
2013-12-09 6:07 ` Kishon Vijay Abraham I
[not found] ` <52A55E2C.7070500-l0cyMroinI0@public.gmane.org>
2013-12-09 11:50 ` Javier Martinez Canillas
2013-12-09 17:40 ` Tony Lindgren
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).