| Message ID | 1386331571-30903-3-git-send-email-kishon@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
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 ?
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
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 for the noise then. Best regards, Javier > Thanks > Kishon
* 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
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();
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(-)