lkml.org 
[lkml]   [2016]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 034/126] usb: musb: core: fix order of arguments to ulpi write callback
    Date
    3.16.7-ckt22 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>

    commit 705e63d2b29c8bbf091119084544d353bda70393 upstream.

    There is a bit of a mess in the order of arguments to the ulpi write
    callback. There is

    int ulpi_write(struct ulpi *ulpi, u8 addr, u8 val)

    in drivers/usb/common/ulpi.c;

    struct usb_phy_io_ops {
    ...
    int (*write)(struct usb_phy *x, u32 val, u32 reg);
    }

    in include/linux/usb/phy.h.

    The callback registered by the musb driver has to comply to the latter,
    but up to now had "offset" first which effectively made the function
    broken for correct users. So flip the order and while at it also
    switch to the parameter names of struct usb_phy_io_ops's write.

    Fixes: ffb865b1e460 ("usb: musb: add ulpi access operations")
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/usb/musb/musb_core.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
    index e2c34c83f409..28018270ec7d 100644
    --- a/drivers/usb/musb/musb_core.c
    +++ b/drivers/usb/musb/musb_core.c
    @@ -132,7 +132,7 @@ static inline struct musb *dev_to_musb(struct device *dev)
    /*-------------------------------------------------------------------------*/

    #ifndef CONFIG_BLACKFIN
    -static int musb_ulpi_read(struct usb_phy *phy, u32 offset)
    +static int musb_ulpi_read(struct usb_phy *phy, u32 reg)
    {
    void __iomem *addr = phy->io_priv;
    int i = 0;
    @@ -151,7 +151,7 @@ static int musb_ulpi_read(struct usb_phy *phy, u32 offset)
    * ULPICarKitControlDisableUTMI after clearing POWER_SUSPENDM.
    */

    - musb_writeb(addr, MUSB_ULPI_REG_ADDR, (u8)offset);
    + musb_writeb(addr, MUSB_ULPI_REG_ADDR, (u8)reg);
    musb_writeb(addr, MUSB_ULPI_REG_CONTROL,
    MUSB_ULPI_REG_REQ | MUSB_ULPI_RDN_WR);

    @@ -176,7 +176,7 @@ out:
    return ret;
    }

    -static int musb_ulpi_write(struct usb_phy *phy, u32 offset, u32 data)
    +static int musb_ulpi_write(struct usb_phy *phy, u32 val, u32 reg)
    {
    void __iomem *addr = phy->io_priv;
    int i = 0;
    @@ -191,8 +191,8 @@ static int musb_ulpi_write(struct usb_phy *phy, u32 offset, u32 data)
    power &= ~MUSB_POWER_SUSPENDM;
    musb_writeb(addr, MUSB_POWER, power);

    - musb_writeb(addr, MUSB_ULPI_REG_ADDR, (u8)offset);
    - musb_writeb(addr, MUSB_ULPI_REG_DATA, (u8)data);
    + musb_writeb(addr, MUSB_ULPI_REG_ADDR, (u8)reg);
    + musb_writeb(addr, MUSB_ULPI_REG_DATA, (u8)val);
    musb_writeb(addr, MUSB_ULPI_REG_CONTROL, MUSB_ULPI_REG_REQ);

    while (!(musb_readb(addr, MUSB_ULPI_REG_CONTROL)

    \
     
     \ /
      Last update: 2016-01-06 12:41    [W:4.165 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site