lkml.org 
[lkml]   [2012]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v4 01/23] mfd: omap-usb-host: get rid of cpu_is_omap..() macros
    Hi Samuel,

    * Roger Quadros <rogerq@ti.com> [121210 02:23]:
    > Instead of using cpu_is_omap..() macros in the device driver we
    > rely on information provided in the platform data.
    >
    > The only information we need is whether the USB Host module has
    > a single ULPI bypass control bit for all ports or individual bypass
    > control bits for each port. OMAP3 REV2.1 and earlier have the former.

    I'd like to apply this patch as a fix so I can finally nuke plat/cpu.h
    for omaps by -rc1 before more drivers start using it again.

    That is assuming nobody else is planning on merging this series for
    v3.8 presumably. Want to ack this one?

    Regards,

    Tony


    >
    > Signed-off-by: Roger Quadros <rogerq@ti.com>
    > CC: Tony Lindgren <tony@atomide.com>
    > ---
    > arch/arm/mach-omap2/usb-host.c | 4 ++++
    > drivers/mfd/omap-usb-host.c | 2 +-
    > include/linux/platform_data/usb-omap.h | 3 +++
    > 3 files changed, 8 insertions(+), 1 deletions(-)
    >
    > diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
    > index d1dbe12..2e44e8a 100644
    > --- a/arch/arm/mach-omap2/usb-host.c
    > +++ b/arch/arm/mach-omap2/usb-host.c
    > @@ -508,6 +508,10 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
    > if (cpu_is_omap34xx()) {
    > setup_ehci_io_mux(pdata->port_mode);
    > setup_ohci_io_mux(pdata->port_mode);
    > +
    > + if (omap_rev() <= OMAP3430_REV_ES2_1)
    > + usbhs_data.single_ulpi_bypass = true;
    > +
    > } else if (cpu_is_omap44xx()) {
    > setup_4430ehci_io_mux(pdata->port_mode);
    > setup_4430ohci_io_mux(pdata->port_mode);
    > diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
    > index cebfe0a..fe7906b 100644
    > --- a/drivers/mfd/omap-usb-host.c
    > +++ b/drivers/mfd/omap-usb-host.c
    > @@ -384,7 +384,7 @@ static void omap_usbhs_init(struct device *dev)
    > reg &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS;
    >
    > /* Bypass the TLL module for PHY mode operation */
    > - if (cpu_is_omap3430() && (omap_rev() <= OMAP3430_REV_ES2_1)) {
    > + if (pdata->single_ulpi_bypass) {
    > dev_dbg(dev, "OMAP3 ES version <= ES2.1\n");
    > if (is_ehci_phy_mode(pdata->port_mode[0]) ||
    > is_ehci_phy_mode(pdata->port_mode[1]) ||
    > diff --git a/include/linux/platform_data/usb-omap.h b/include/linux/platform_data/usb-omap.h
    > index 8570bcf..ef65b67 100644
    > --- a/include/linux/platform_data/usb-omap.h
    > +++ b/include/linux/platform_data/usb-omap.h
    > @@ -59,6 +59,9 @@ struct usbhs_omap_platform_data {
    >
    > struct ehci_hcd_omap_platform_data *ehci_data;
    > struct ohci_hcd_omap_platform_data *ohci_data;
    > +
    > + /* OMAP3 <= ES2.1 have a single ulpi bypass control bit */
    > + unsigned single_ulpi_bypass:1;
    > };
    >
    > /*-------------------------------------------------------------------------*/
    > --
    > 1.7.4.1
    >


    \
     
     \ /
      Last update: 2012-12-13 23:41    [W:2.301 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site