]> git.hungrycats.org Git - linux/commitdiff
phy: samsung: s5pv210-usb2: Add delay after reset
authorJonathan Bakker <xc-racer2@live.ca>
Sat, 25 Apr 2020 17:36:33 +0000 (10:36 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Oct 2020 11:12:43 +0000 (13:12 +0200)
[ Upstream commit 05942b8c36c7eb5d3fc5e375d4b0d0c49562e85d ]

The USB phy takes some time to reset, so make sure we give it to it. The
delay length was taken from the 4x12 phy driver.

This manifested in issues with the DWC2 driver since commit fe369e1826b3
("usb: dwc2: Make dwc2_readl/writel functions endianness-agnostic.")
where the endianness check would read the DWC ID as 0 due to the phy still
resetting, resulting in the wrong endian mode being chosen.

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Link: https://lore.kernel.org/r/BN6PR04MB06605D52502816E500683553A3D10@BN6PR04MB0660.namprd04.prod.outlook.com
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/phy/samsung/phy-s5pv210-usb2.c

index f6f72339bbc32ace9605fed669f9d34e42bfae52..bb7fdf491c1c2ae4bea42d95d6cc4eb0af28f949 100644 (file)
@@ -142,6 +142,10 @@ static void s5pv210_phy_pwr(struct samsung_usb2_phy_instance *inst, bool on)
                udelay(10);
                rst &= ~rstbits;
                writel(rst, drv->reg_phy + S5PV210_UPHYRST);
+               /* The following delay is necessary for the reset sequence to be
+                * completed
+                */
+               udelay(80);
        } else {
                pwr = readl(drv->reg_phy + S5PV210_UPHYPWR);
                pwr |= phypwr;