]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
phy: ti-pipe3: fix missing bit-wise or operator when assigning val
authorColin Ian King <colin.king@canonical.com>
Tue, 19 Feb 2019 14:53:49 +0000 (14:53 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 25 May 2019 16:23:27 +0000 (18:23 +0200)
commit e6577cb5103b7ca7c0204c0c86ef4af8aa6288f6 upstream.

There seems to be a missing bit-wise or operator when setting val,
fix this by adding it in.

Fixes: 2796ceb0c18a ("phy: ti-pipe3: Update pcie phy settings")
Cc: stable@vger.kernel.org # v4.19+
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/phy/ti/phy-ti-pipe3.c

index 68ce4a082b9b2284535965cdcbd856a3d5e7aeeb..693acc167351cf4ae63a522026f6b9e4f94221bf 100644 (file)
@@ -303,7 +303,7 @@ static void ti_pipe3_calibrate(struct ti_pipe3 *phy)
 
        val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_ANA_PROGRAMMABILITY);
        val &= ~(INTERFACE_MASK | LOSD_MASK | MEM_PLLDIV);
-       val = (0x1 << INTERFACE_SHIFT | 0xA << LOSD_SHIFT);
+       val |= (0x1 << INTERFACE_SHIFT | 0xA << LOSD_SHIFT);
        ti_pipe3_writel(phy->phy_rx, PCIEPHYRX_ANA_PROGRAMMABILITY, val);
 
        val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_DIGITAL_MODES);