* [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform
@ 2013-07-08 11:14 Kishon Vijay Abraham I
2013-07-08 11:14 ` [PATCH v2 1/4] arm: omap: Add phy binding info for musb in plat data Kishon Vijay Abraham I
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Kishon Vijay Abraham I @ 2013-07-08 11:14 UTC (permalink / raw)
To: linux-arm-kernel
This series fixes the USB enumeration issue caused because of the controller
not able to get a reference to the PHY because of incorrect binding in the
board file.
In the case of non-dt boot, the platform specific initialization file
(board file) will do usb_bind_phy that binds the usb controller with the
PHY using device names. After the device names are created using
PLATFORM_DEVID_AUTO, our original method of binding by device names doesn't
work reliably (since the device name changes). Hence the usb controller
is made to use labels for getting the PHY.
Here the PHY name is added in the plat data of USB controller device which
should be used by the controller driver to get the PHY.
Two new APIs usb_get_phy_by_name and devm_usb_get_phy_by_name are added to
be used by the controller to get the PHY by name.
Changes from v1:
*) Rebased to the latest mainline kernel
Changes from RFC
*) Changed the signature of usb_get_phy_by_name() not to use struct device *
Kishon Vijay Abraham I (4):
arm: omap: Add phy binding info for musb in plat data
usb: phy: add a new API to get PHY ref by label
usb: musb: omap: use the new API to get PHY reference by label
arm: omap: remove using usb_bind_phy for binding musb and phy
arch/arm/mach-omap2/board-2430sdp.c | 1 -
arch/arm/mach-omap2/board-3430sdp.c | 1 -
arch/arm/mach-omap2/board-cm-t35.c | 1 -
arch/arm/mach-omap2/board-devkit8000.c | 1 -
arch/arm/mach-omap2/board-igep0020.c | 1 -
arch/arm/mach-omap2/board-ldp.c | 1 -
arch/arm/mach-omap2/board-omap3beagle.c | 1 -
arch/arm/mach-omap2/board-omap3evm.c | 1 -
arch/arm/mach-omap2/board-omap3logic.c | 1 -
arch/arm/mach-omap2/board-omap3pandora.c | 1 -
arch/arm/mach-omap2/board-omap3stalker.c | 1 -
arch/arm/mach-omap2/board-omap3touchbook.c | 1 -
arch/arm/mach-omap2/board-overo.c | 1 -
arch/arm/mach-omap2/board-rm680.c | 1 -
arch/arm/mach-omap2/board-rx51.c | 1 -
arch/arm/mach-omap2/board-zoom-peripherals.c | 1 -
arch/arm/mach-omap2/usb-musb.c | 3 +
drivers/usb/musb/musb_core.c | 1 +
drivers/usb/musb/musb_core.h | 1 +
drivers/usb/musb/omap2430.c | 2 +-
drivers/usb/phy/phy.c | 77 ++++++++++++++++++++++++++
include/linux/usb/musb.h | 3 +
include/linux/usb/phy.h | 14 +++++
23 files changed, 100 insertions(+), 17 deletions(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v2 1/4] arm: omap: Add phy binding info for musb in plat data 2013-07-08 11:14 [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform Kishon Vijay Abraham I @ 2013-07-08 11:14 ` Kishon Vijay Abraham I 2013-07-16 12:44 ` Tony Lindgren 2013-07-08 11:14 ` [PATCH v2 2/4] usb: phy: add a new API to get PHY ref by label Kishon Vijay Abraham I ` (3 subsequent siblings) 4 siblings, 1 reply; 11+ messages in thread From: Kishon Vijay Abraham I @ 2013-07-08 11:14 UTC (permalink / raw) To: linux-arm-kernel In order for controllers to get PHY in case of non dt boot, the phy binding information (phy label) should be added in the platform data of the controller. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- arch/arm/mach-omap2/usb-musb.c | 3 +++ include/linux/usb/musb.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index 8c4de27..20b42de 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c @@ -85,6 +85,9 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data) musb_plat.mode = board_data->mode; musb_plat.extvbus = board_data->extvbus; + if (cpu_is_omap34xx()) + musb_plat.phy_name = "twl4030"; + if (soc_is_am35xx()) { oh_name = "am35x_otg_hs"; name = "musb-am35x"; diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h index 053c268..c05d46d 100644 --- a/include/linux/usb/musb.h +++ b/include/linux/usb/musb.h @@ -104,6 +104,9 @@ struct musb_hdrc_platform_data { /* for clk_get() */ const char *clock; + /* phy device label */ + const char *phy_name; + /* (HOST or OTG) switch VBUS on/off */ int (*set_vbus)(struct device *dev, int is_on); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 1/4] arm: omap: Add phy binding info for musb in plat data 2013-07-08 11:14 ` [PATCH v2 1/4] arm: omap: Add phy binding info for musb in plat data Kishon Vijay Abraham I @ 2013-07-16 12:44 ` Tony Lindgren 0 siblings, 0 replies; 11+ messages in thread From: Tony Lindgren @ 2013-07-16 12:44 UTC (permalink / raw) To: linux-arm-kernel * Kishon Vijay Abraham I <kishon@ti.com> [130708 04:20]: > In order for controllers to get PHY in case of non dt boot, the phy > binding information (phy label) should be added in the platform > data of the controller. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > Acked-by: Felipe Balbi <balbi@ti.com> > Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> > --- > arch/arm/mach-omap2/usb-musb.c | 3 +++ > include/linux/usb/musb.h | 3 +++ > 2 files changed, 6 insertions(+) > > diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c > index 8c4de27..20b42de 100644 > --- a/arch/arm/mach-omap2/usb-musb.c > +++ b/arch/arm/mach-omap2/usb-musb.c > @@ -85,6 +85,9 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data) > musb_plat.mode = board_data->mode; > musb_plat.extvbus = board_data->extvbus; > > + if (cpu_is_omap34xx()) > + musb_plat.phy_name = "twl4030"; > + > if (soc_is_am35xx()) { > oh_name = "am35x_otg_hs"; > name = "musb-am35x"; > diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h > index 053c268..c05d46d 100644 > --- a/include/linux/usb/musb.h > +++ b/include/linux/usb/musb.h > @@ -104,6 +104,9 @@ struct musb_hdrc_platform_data { > /* for clk_get() */ > const char *clock; > > + /* phy device label */ > + const char *phy_name; > + > /* (HOST or OTG) switch VBUS on/off */ > int (*set_vbus)(struct device *dev, int is_on); > > -- > 1.7.10.4 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 2/4] usb: phy: add a new API to get PHY ref by label 2013-07-08 11:14 [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform Kishon Vijay Abraham I 2013-07-08 11:14 ` [PATCH v2 1/4] arm: omap: Add phy binding info for musb in plat data Kishon Vijay Abraham I @ 2013-07-08 11:14 ` Kishon Vijay Abraham I 2013-07-08 11:14 ` [PATCH v2 3/4] usb: musb: omap: use the new API to get PHY reference " Kishon Vijay Abraham I ` (2 subsequent siblings) 4 siblings, 0 replies; 11+ messages in thread From: Kishon Vijay Abraham I @ 2013-07-08 11:14 UTC (permalink / raw) To: linux-arm-kernel After the devices are created using PLATFORM_DEVID_AUTO, devm_usb_get_phy_dev and usb_get_phy_dev can't be used reliably as it relies on the device_names passed in usb_bind_phy. So added a new API to get the PHY reference by PHY label (PHY label should be filled which creating the PHY). Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/usb/phy/phy.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/usb/phy.h | 14 +++++++++ 2 files changed, 91 insertions(+) diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c index a9984c7..92bba2f 100644 --- a/drivers/usb/phy/phy.c +++ b/drivers/usb/phy/phy.c @@ -55,6 +55,21 @@ static struct usb_phy *__usb_find_phy_dev(struct device *dev, return ERR_PTR(-ENODEV); } +static struct usb_phy *__usb_find_phy_by_name(struct list_head *list, + const char *name) +{ + struct usb_phy *phy = NULL; + + list_for_each_entry(phy, list, head) { + if (strcmp(name, phy->label)) + continue; + + return phy; + } + + return ERR_PTR(-ENODEV); +} + static struct usb_phy *__of_usb_find_phy(struct device_node *node) { struct usb_phy *phy; @@ -272,6 +287,68 @@ struct usb_phy *devm_usb_get_phy_dev(struct device *dev, u8 index) EXPORT_SYMBOL_GPL(devm_usb_get_phy_dev); /** + * usb_get_phy_by_name - find the USB PHY using device ptr and phy label + * @name - the name of the phy + * + * Returns the phy driver, after getting a refcount to it; or + * -ENODEV if there is no such phy. The caller is responsible for + * calling usb_put_phy() to release that count. + * + * For use by USB host and peripheral drivers. + */ +struct usb_phy *usb_get_phy_by_name(const char *name) +{ + struct usb_phy *phy = NULL; + unsigned long flags; + + spin_lock_irqsave(&phy_lock, flags); + + phy = __usb_find_phy_by_name(&phy_list, name); + if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) { + pr_err("unable to find transceiver\n"); + goto err0; + } + + get_device(phy->dev); + +err0: + spin_unlock_irqrestore(&phy_lock, flags); + + return phy; +} +EXPORT_SYMBOL_GPL(usb_get_phy_by_name); + +/** + * devm_usb_get_phy_by_name - find the USB PHY using device ptr and phy label + * @dev - device that requests this phy + * @name - the label of the phy + * + * Gets the phy using usb_get_phy_by_name(), and associates a device with it + * using devres. On driver detach, release function is invoked on the devres + * data, then, devres data is freed. + * + * For use by USB host and peripheral drivers. + */ +struct usb_phy *devm_usb_get_phy_by_name(struct device *dev, const char *name) +{ + struct usb_phy **ptr, *phy; + + ptr = devres_alloc(devm_usb_phy_release, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return NULL; + + phy = usb_get_phy_by_name(name); + if (!IS_ERR(phy)) { + *ptr = phy; + devres_add(dev, ptr); + } else + devres_free(ptr); + + return phy; +} +EXPORT_SYMBOL_GPL(devm_usb_get_phy_by_name); + +/** * devm_usb_put_phy - release the USB PHY * @dev - device that wants to release this phy * @phy - the phy returned by devm_usb_get_phy() diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index 4403680..2adb782 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -197,6 +197,9 @@ extern struct usb_phy *devm_usb_get_phy(struct device *dev, enum usb_phy_type type); extern struct usb_phy *usb_get_phy_dev(struct device *dev, u8 index); extern struct usb_phy *devm_usb_get_phy_dev(struct device *dev, u8 index); +extern struct usb_phy *usb_get_phy_by_name(const char *name); +extern struct usb_phy *devm_usb_get_phy_by_name(struct device *dev, + const char *name); extern struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev, const char *phandle, u8 index); extern void usb_put_phy(struct usb_phy *); @@ -225,6 +228,17 @@ static inline struct usb_phy *devm_usb_get_phy_dev(struct device *dev, u8 index) return ERR_PTR(-ENXIO); } +static inline struct usb_phy *usb_get_phy_by_name(const char *name) +{ + return ERR_PTR(-ENXIO); +} + +static inline struct usb_phy *devm_usb_get_phy_by_name(struct device *dev, + const char *name) +{ + return ERR_PTR(-ENXIO); +} + static inline struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev, const char *phandle, u8 index) { -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 3/4] usb: musb: omap: use the new API to get PHY reference by label 2013-07-08 11:14 [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform Kishon Vijay Abraham I 2013-07-08 11:14 ` [PATCH v2 1/4] arm: omap: Add phy binding info for musb in plat data Kishon Vijay Abraham I 2013-07-08 11:14 ` [PATCH v2 2/4] usb: phy: add a new API to get PHY ref by label Kishon Vijay Abraham I @ 2013-07-08 11:14 ` Kishon Vijay Abraham I 2013-07-08 11:14 ` [PATCH v2 4/4] arm: omap: remove using usb_bind_phy for binding musb and phy Kishon Vijay Abraham I 2013-07-16 5:52 ` [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform Kishon Vijay Abraham I 4 siblings, 0 replies; 11+ messages in thread From: Kishon Vijay Abraham I @ 2013-07-08 11:14 UTC (permalink / raw) To: linux-arm-kernel After the devices are created using PLATFORM_DEVID_AUTO, devm_usb_get_phy_dev and usb_get_phy_dev can't be used reliably as it relies on the device_names passed in usb_bind_phy. So used the new API devm_usb_get_phy_by_name to get the PHY reference. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/usb/musb/musb_core.c | 1 + drivers/usb/musb/musb_core.h | 1 + drivers/usb/musb/omap2430.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 29a24ce..5eb6cd7 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1814,6 +1814,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) musb->min_power = plat->min_power; musb->ops = plat->platform_ops; musb->port_mode = plat->mode; + musb->phy_name = plat->phy_name; /* The musb_platform_init() call: * - adjusts musb->mregs diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 7d341c3..1f0863b 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -424,6 +424,7 @@ struct musb { unsigned double_buffer_not_ok:1; struct musb_hdrc_config *config; + const char *phy_name; #ifdef MUSB_CONFIG_PROC_FS struct proc_dir_entry *proc_entry; diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 6708a3b..5b6113a 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -352,7 +352,7 @@ static int omap2430_musb_init(struct musb *musb) musb->xceiv = devm_usb_get_phy_by_phandle(dev->parent, "usb-phy", 0); else - musb->xceiv = devm_usb_get_phy_dev(dev, 0); + musb->xceiv = devm_usb_get_phy_by_name(dev, musb->phy_name); if (IS_ERR(musb->xceiv)) { status = PTR_ERR(musb->xceiv); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 4/4] arm: omap: remove using usb_bind_phy for binding musb and phy 2013-07-08 11:14 [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform Kishon Vijay Abraham I ` (2 preceding siblings ...) 2013-07-08 11:14 ` [PATCH v2 3/4] usb: musb: omap: use the new API to get PHY reference " Kishon Vijay Abraham I @ 2013-07-08 11:14 ` Kishon Vijay Abraham I 2013-07-16 12:46 ` Tony Lindgren 2013-07-16 5:52 ` [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform Kishon Vijay Abraham I 4 siblings, 1 reply; 11+ messages in thread From: Kishon Vijay Abraham I @ 2013-07-08 11:14 UTC (permalink / raw) To: linux-arm-kernel Now that MUSB for OMAP started using devm_usb_get_phy_by_name which does not require PHY library to already have the binding information, removed usb_bind_phy calls that binds the MUSB controller with the PHY from the board files. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- arch/arm/mach-omap2/board-2430sdp.c | 1 - arch/arm/mach-omap2/board-3430sdp.c | 1 - arch/arm/mach-omap2/board-cm-t35.c | 1 - arch/arm/mach-omap2/board-devkit8000.c | 1 - arch/arm/mach-omap2/board-igep0020.c | 1 - arch/arm/mach-omap2/board-ldp.c | 1 - arch/arm/mach-omap2/board-omap3beagle.c | 1 - arch/arm/mach-omap2/board-omap3evm.c | 1 - arch/arm/mach-omap2/board-omap3logic.c | 1 - arch/arm/mach-omap2/board-omap3pandora.c | 1 - arch/arm/mach-omap2/board-omap3stalker.c | 1 - arch/arm/mach-omap2/board-omap3touchbook.c | 1 - arch/arm/mach-omap2/board-overo.c | 1 - arch/arm/mach-omap2/board-rm680.c | 1 - arch/arm/mach-omap2/board-rx51.c | 1 - arch/arm/mach-omap2/board-zoom-peripherals.c | 1 - 16 files changed, 16 deletions(-) diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 244d8a5..30d81f2 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c @@ -233,7 +233,6 @@ 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_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 23b004a..7f431b4 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -590,7 +590,6 @@ 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_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 d4622ed..c776c66 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c @@ -691,7 +691,6 @@ 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_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 f1d91ba..2da5fd9 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -594,7 +594,6 @@ 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_musb_init(NULL); usbhs_init(&usbhs_bdata); board_nand_init(devkit8000_nand_partitions, diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index b54562d..5451c9c 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c @@ -628,7 +628,6 @@ static void __init igep_init(void) omap_serial_init(); omap_sdrc_init(m65kxxxxam_sdrc_params, m65kxxxxam_sdrc_params); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); usb_musb_init(NULL); igep_flash_init(); diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 62e4f70..ff2892d 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -377,7 +377,6 @@ 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_musb_init(NULL); board_nand_init(ldp_nand_partitions, ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0, nand_default_timings); diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 04c1165..47d7dd7 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -551,7 +551,6 @@ 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_musb_init(NULL); usbhs_init(&usbhs_bdata); diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 8c02626..9bfc99f 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -706,7 +706,6 @@ static void __init omap3_evm_init(void) omap_mux_init_gpio(135, OMAP_PIN_OUTPUT); phy_data[0].reset_gpio = 135; } - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); usb_musb_init(&musb_board_data); usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data)); diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index bab51e6..16e4e2a 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c @@ -216,7 +216,6 @@ static void __init omap3logic_init(void) board_mmc_init(); board_smsc911x_init(); - usb_bind_phy("musb-hdrc.0.auto", 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 b1547a0..f058f43 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -611,7 +611,6 @@ 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_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 d37e6b1..6f6fc92 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c @@ -394,7 +394,6 @@ 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_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..bbff6de 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c @@ -367,7 +367,6 @@ 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_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 5748b5d..6c2bb5a 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -473,7 +473,6 @@ 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_musb_init(NULL); usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data)); diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c index 345e8c4..cadeb5c 100644 --- a/arch/arm/mach-omap2/board-rm680.c +++ b/arch/arm/mach-omap2/board-rm680.c @@ -135,7 +135,6 @@ static void __init rm680_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_musb_init(NULL); rm680_peripherals_init(); } diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index d2ea68e..0d16d37 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c @@ -99,7 +99,6 @@ 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_musb_init(&musb_board_data); rx51_peripherals_init(); diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index a90375d..d05db2d 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -353,7 +353,6 @@ void __init zoom_peripherals_init(void) omap_i2c_init(); pwm_add_table(zoom_pwm_lookup, ARRAY_SIZE(zoom_pwm_lookup)); platform_add_devices(zoom_devices, ARRAY_SIZE(zoom_devices)); - usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); usb_musb_init(NULL); enable_board_wakeup_source(); omap_serial_init(); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 4/4] arm: omap: remove using usb_bind_phy for binding musb and phy 2013-07-08 11:14 ` [PATCH v2 4/4] arm: omap: remove using usb_bind_phy for binding musb and phy Kishon Vijay Abraham I @ 2013-07-16 12:46 ` Tony Lindgren 0 siblings, 0 replies; 11+ messages in thread From: Tony Lindgren @ 2013-07-16 12:46 UTC (permalink / raw) To: linux-arm-kernel * Kishon Vijay Abraham I <kishon@ti.com> [130708 04:21]: > Now that MUSB for OMAP started using devm_usb_get_phy_by_name > which does not require PHY library to already have the binding > information, removed usb_bind_phy calls that binds the MUSB controller > with the PHY from the board files. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > Acked-by: Felipe Balbi <balbi@ti.com> > Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > > --- > arch/arm/mach-omap2/board-2430sdp.c | 1 - > arch/arm/mach-omap2/board-3430sdp.c | 1 - > arch/arm/mach-omap2/board-cm-t35.c | 1 - > arch/arm/mach-omap2/board-devkit8000.c | 1 - > arch/arm/mach-omap2/board-igep0020.c | 1 - > arch/arm/mach-omap2/board-ldp.c | 1 - > arch/arm/mach-omap2/board-omap3beagle.c | 1 - > arch/arm/mach-omap2/board-omap3evm.c | 1 - > arch/arm/mach-omap2/board-omap3logic.c | 1 - > arch/arm/mach-omap2/board-omap3pandora.c | 1 - > arch/arm/mach-omap2/board-omap3stalker.c | 1 - > arch/arm/mach-omap2/board-omap3touchbook.c | 1 - > arch/arm/mach-omap2/board-overo.c | 1 - > arch/arm/mach-omap2/board-rm680.c | 1 - > arch/arm/mach-omap2/board-rx51.c | 1 - > arch/arm/mach-omap2/board-zoom-peripherals.c | 1 - > 16 files changed, 16 deletions(-) It's best that I queue this as a follow up patch after the other patches are merged. Otherwise we'll be introducing pointless merge conflicts with board-*.c files changing and disappearing as we move to DT based booting. Regards, Tony ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform 2013-07-08 11:14 [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform Kishon Vijay Abraham I ` (3 preceding siblings ...) 2013-07-08 11:14 ` [PATCH v2 4/4] arm: omap: remove using usb_bind_phy for binding musb and phy Kishon Vijay Abraham I @ 2013-07-16 5:52 ` Kishon Vijay Abraham I 2013-07-16 12:42 ` Felipe Balbi 4 siblings, 1 reply; 11+ messages in thread From: Kishon Vijay Abraham I @ 2013-07-16 5:52 UTC (permalink / raw) To: linux-arm-kernel Tony, On Monday 08 July 2013 04:44 PM, Kishon Vijay Abraham I wrote: > This series fixes the USB enumeration issue caused because of the controller > not able to get a reference to the PHY because of incorrect binding in the > board file. > > In the case of non-dt boot, the platform specific initialization file > (board file) will do usb_bind_phy that binds the usb controller with the > PHY using device names. After the device names are created using > PLATFORM_DEVID_AUTO, our original method of binding by device names doesn't > work reliably (since the device name changes). Hence the usb controller > is made to use labels for getting the PHY. > > Here the PHY name is added in the plat data of USB controller device which > should be used by the controller driver to get the PHY. > Two new APIs usb_get_phy_by_name and devm_usb_get_phy_by_name are added to > be used by the controller to get the PHY by name. You haven't picked this patch series? -Kishon ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform 2013-07-16 5:52 ` [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform Kishon Vijay Abraham I @ 2013-07-16 12:42 ` Felipe Balbi 2013-07-16 12:47 ` Tony Lindgren 2013-07-19 8:45 ` Kishon Vijay Abraham I 0 siblings, 2 replies; 11+ messages in thread From: Felipe Balbi @ 2013-07-16 12:42 UTC (permalink / raw) To: linux-arm-kernel Hi, On Tue, Jul 16, 2013 at 11:22:38AM +0530, Kishon Vijay Abraham I wrote: > Tony, > > On Monday 08 July 2013 04:44 PM, Kishon Vijay Abraham I wrote: > > This series fixes the USB enumeration issue caused because of the controller > > not able to get a reference to the PHY because of incorrect binding in the > > board file. > > > > In the case of non-dt boot, the platform specific initialization file > > (board file) will do usb_bind_phy that binds the usb controller with the > > PHY using device names. After the device names are created using > > PLATFORM_DEVID_AUTO, our original method of binding by device names doesn't > > work reliably (since the device name changes). Hence the usb controller > > is made to use labels for getting the PHY. > > > > Here the PHY name is added in the plat data of USB controller device which > > should be used by the controller driver to get the PHY. > > Two new APIs usb_get_phy_by_name and devm_usb_get_phy_by_name are added to > > be used by the controller to get the PHY by name. > > You haven't picked this patch series? yeah and now it's too much to send during the -rc series. Here's what we can do, we can to minimum fix for -rc series (patching the names again) and I'll queue everything else for mailine if tony gives me his Ack for all arch/arm/*omap* parts. Sounds good ? -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130716/376cd3a8/attachment.sig> ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform 2013-07-16 12:42 ` Felipe Balbi @ 2013-07-16 12:47 ` Tony Lindgren 2013-07-19 8:45 ` Kishon Vijay Abraham I 1 sibling, 0 replies; 11+ messages in thread From: Tony Lindgren @ 2013-07-16 12:47 UTC (permalink / raw) To: linux-arm-kernel * Felipe Balbi <balbi@ti.com> [130716 05:49]: > Hi, > > On Tue, Jul 16, 2013 at 11:22:38AM +0530, Kishon Vijay Abraham I wrote: > > Tony, > > > > On Monday 08 July 2013 04:44 PM, Kishon Vijay Abraham I wrote: > > > This series fixes the USB enumeration issue caused because of the controller > > > not able to get a reference to the PHY because of incorrect binding in the > > > board file. > > > > > > In the case of non-dt boot, the platform specific initialization file > > > (board file) will do usb_bind_phy that binds the usb controller with the > > > PHY using device names. After the device names are created using > > > PLATFORM_DEVID_AUTO, our original method of binding by device names doesn't > > > work reliably (since the device name changes). Hence the usb controller > > > is made to use labels for getting the PHY. > > > > > > Here the PHY name is added in the plat data of USB controller device which > > > should be used by the controller driver to get the PHY. > > > Two new APIs usb_get_phy_by_name and devm_usb_get_phy_by_name are added to > > > be used by the controller to get the PHY by name. > > > > You haven't picked this patch series? > > yeah and now it's too much to send during the -rc series. Here's what we > can do, we can to minimum fix for -rc series (patching the names again) > and I'll queue everything else for mailine if tony gives me his Ack for > all arch/arm/*omap* parts. > > Sounds good ? Sounds good to me, except let's queue the last patch separately as cleanup after the others are merged. I've acked the first patch, that should not cause merge conflicts. Regards, Tony ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform 2013-07-16 12:42 ` Felipe Balbi 2013-07-16 12:47 ` Tony Lindgren @ 2013-07-19 8:45 ` Kishon Vijay Abraham I 1 sibling, 0 replies; 11+ messages in thread From: Kishon Vijay Abraham I @ 2013-07-19 8:45 UTC (permalink / raw) To: linux-arm-kernel Felipe, On Tuesday 16 July 2013 06:12 PM, Felipe Balbi wrote: > Hi, > > On Tue, Jul 16, 2013 at 11:22:38AM +0530, Kishon Vijay Abraham I wrote: >> Tony, >> >> On Monday 08 July 2013 04:44 PM, Kishon Vijay Abraham I wrote: >>> This series fixes the USB enumeration issue caused because of the controller >>> not able to get a reference to the PHY because of incorrect binding in the >>> board file. >>> >>> In the case of non-dt boot, the platform specific initialization file >>> (board file) will do usb_bind_phy that binds the usb controller with the >>> PHY using device names. After the device names are created using >>> PLATFORM_DEVID_AUTO, our original method of binding by device names doesn't >>> work reliably (since the device name changes). Hence the usb controller >>> is made to use labels for getting the PHY. >>> >>> Here the PHY name is added in the plat data of USB controller device which >>> should be used by the controller driver to get the PHY. >>> Two new APIs usb_get_phy_by_name and devm_usb_get_phy_by_name are added to >>> be used by the controller to get the PHY by name. >> >> You haven't picked this patch series? > > yeah and now it's too much to send during the -rc series. Here's what we > can do, we can to minimum fix for -rc series (patching the names again) There are a lot of different boards available using OMAP3 and the device names (PHY and MUSB) vary across each board (apparently). It will be difficult to find the device names (for PHY and MUSB) for all the different boards available (partly because of non-availability of all the boards) and test it. Thanks Kishon ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-07-19 8:45 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-07-08 11:14 [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform Kishon Vijay Abraham I 2013-07-08 11:14 ` [PATCH v2 1/4] arm: omap: Add phy binding info for musb in plat data Kishon Vijay Abraham I 2013-07-16 12:44 ` Tony Lindgren 2013-07-08 11:14 ` [PATCH v2 2/4] usb: phy: add a new API to get PHY ref by label Kishon Vijay Abraham I 2013-07-08 11:14 ` [PATCH v2 3/4] usb: musb: omap: use the new API to get PHY reference " Kishon Vijay Abraham I 2013-07-08 11:14 ` [PATCH v2 4/4] arm: omap: remove using usb_bind_phy for binding musb and phy Kishon Vijay Abraham I 2013-07-16 12:46 ` Tony Lindgren 2013-07-16 5:52 ` [PATCH v2 0/4] usb: musb: fix USB enumeration issue in OMAP3 platform Kishon Vijay Abraham I 2013-07-16 12:42 ` Felipe Balbi 2013-07-16 12:47 ` Tony Lindgren 2013-07-19 8:45 ` Kishon Vijay Abraham I
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).