]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
usb: phy: tegra: Correct definition of B_SESS_VLD_WAKEUP_EN bit
authorDmitry Osipenko <digetx@gmail.com>
Sun, 13 Jun 2021 14:59:36 +0000 (17:59 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 15 Jun 2021 13:36:23 +0000 (15:36 +0200)
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>
drivers/usb/phy/phy-tegra-usb.c

index 10fafcf9801b1162587ee7f1890dc40fc934de75..c0f432d509aab3578c54812639b889a8ccfcba27 100644 (file)
@@ -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);