| Message ID | 1374129984-765-5-git-send-email-kishon@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Kishon Vijay Abraham I <kishon@ti.com> [130717 23:53]: > In order for controllers to get PHY in case of non dt boot, the phy > binding information (phy device name) should be added in the platform > data of the controller. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > Acked-by: Felipe Balbi <balbi@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..6aa7cbf 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_label = "twl4030"; > + > if (soc_is_am35xx()) { > oh_name = "am35x_otg_hs"; > name = "musb-am35x"; I don't think there's a USB PHY on non-twl4030 chips, so this should be OK: Acked-by: Tony Lindgren <tony@atomide.com> > diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h > index 053c268..596f8c8 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 label */ > + const char *phy_label; > + > /* (HOST or OTG) switch VBUS on/off */ > int (*set_vbus)(struct device *dev, int is_on); > > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index 8c4de27..6aa7cbf 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_label = "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..596f8c8 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 label */ + const char *phy_label; + /* (HOST or OTG) switch VBUS on/off */ int (*set_vbus)(struct device *dev, int is_on);