lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 723/800] usb: phy: tegra: Correct definition of B_SESS_VLD_WAKEUP_EN bit
    Date
    From: Dmitry Osipenko <digetx@gmail.com>

    [ Upstream commit 7917e90667bc8dce02daa3c2e6df47f6fc9481f7 ]

    The B_SESS_VLD_WAKEUP_EN bit 6 was added by a mistake in a previous
    commit. This bit corresponds to B_SESS_END_WAKEUP_EN, which we don't use.
    The B_VBUS_VLD_WAKEUP_EN doesn't exist at all and B_SESS_VLD_WAKEUP_EN
    needs to be in place of it. We don't utilize B-sensors in the driver,
    so it never was a problem, nevertheless let's correct the definition of
    the bits.

    Fixes: 35192007d28d ("usb: phy: tegra: Support waking up from a low power mode")
    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    Link: https://lore.kernel.org/r/20210613145936.9902-2-digetx@gmail.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/phy/phy-tegra-usb.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
    index 10fafcf9801b..c0f432d509aa 100644
    --- a/drivers/usb/phy/phy-tegra-usb.c
    +++ b/drivers/usb/phy/phy-tegra-usb.c
    @@ -58,8 +58,7 @@
    #define USB_WAKEUP_DEBOUNCE_COUNT(x) (((x) & 0x7) << 16)

    #define USB_PHY_VBUS_SENSORS 0x404
    -#define B_SESS_VLD_WAKEUP_EN BIT(6)
    -#define B_VBUS_VLD_WAKEUP_EN BIT(14)
    +#define B_SESS_VLD_WAKEUP_EN BIT(14)
    #define A_SESS_VLD_WAKEUP_EN BIT(22)
    #define A_VBUS_VLD_WAKEUP_EN BIT(30)

    @@ -545,7 +544,7 @@ static int utmi_phy_power_on(struct tegra_usb_phy *phy)

    val = readl_relaxed(base + USB_PHY_VBUS_SENSORS);
    val &= ~(A_VBUS_VLD_WAKEUP_EN | A_SESS_VLD_WAKEUP_EN);
    - val &= ~(B_VBUS_VLD_WAKEUP_EN | B_SESS_VLD_WAKEUP_EN);
    + val &= ~(B_SESS_VLD_WAKEUP_EN);
    writel_relaxed(val, base + USB_PHY_VBUS_SENSORS);

    val = readl_relaxed(base + UTMIP_BAT_CHRG_CFG0);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 11:10    [W:2.230 / U:0.872 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site