* Heikki Krogerus <[email protected]> [141017 07:43]: > Provide complete association for the phy and it's user > (musb) with the new phy lookup method. > > Signed-off-by: Heikki Krogerus <[email protected]>
Kishon, this looks OK for you to queue with other PHY patches: Acked-by: Tony Lindgren <[email protected]> > --- > arch/arm/mach-omap2/twl-common.c | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/mach-omap2/twl-common.c > b/arch/arm/mach-omap2/twl-common.c > index b0d54da..0e4f3e3 100644 > --- a/arch/arm/mach-omap2/twl-common.c > +++ b/arch/arm/mach-omap2/twl-common.c > @@ -91,18 +91,11 @@ void __init omap_pmic_late_init(void) > } > > #if defined(CONFIG_ARCH_OMAP3) > -struct phy_consumer consumers[] = { > - PHY_CONSUMER("musb-hdrc.0", "usb"), > -}; > - > -struct phy_init_data init_data = { > - .consumers = consumers, > - .num_consumers = ARRAY_SIZE(consumers), > -}; > +static struct phy_lookup twl4030_usb_lookup = PHY_LOOKUP("twl4030_usb", > + "musb-hdrc.0", "usb"); > > static struct twl4030_usb_data omap3_usb_pdata = { > - .usb_mode = T2_USB_MODE_ULPI, > - .init_data = &init_data, > + .usb_mode = T2_USB_MODE_ULPI, > }; > > static int omap3_batt_table[] = { > @@ -225,8 +218,10 @@ void __init omap3_pmic_get_config(struct > twl4030_platform_data *pmic_data, > } > > /* Common platform data configurations */ > - if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb) > + if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb) { > + phy_register_lookup(&twl4030_usb_lookup); > pmic_data->usb = &omap3_usb_pdata; > + } > > if (pdata_flags & TWL_COMMON_PDATA_BCI && !pmic_data->bci) > pmic_data->bci = &omap3_bci_pdata; > -- > 2.1.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
