releases/4.19.46/phy-ti-pipe3-fix-missing-bit-wise-or-operator-when-assigning-val.patch

   1 From e6577cb5103b7ca7c0204c0c86ef4af8aa6288f6 Mon Sep 17 00:00:00 2001
   2 From: Colin Ian King <colin.king@canonical.com>
   3 Date: Tue, 19 Feb 2019 14:53:49 +0000
   4 Subject: phy: ti-pipe3: fix missing bit-wise or operator when assigning val
   5
   6 From: Colin Ian King <colin.king@canonical.com>
   7
   8 commit e6577cb5103b7ca7c0204c0c86ef4af8aa6288f6 upstream.
   9
  10 There seems to be a missing bit-wise or operator when setting val,
  11 fix this by adding it in.
  12
  13 Fixes: 2796ceb0c18a ("phy: ti-pipe3: Update pcie phy settings")
  14 Cc: stable@vger.kernel.org # v4.19+
  15 Signed-off-by: Colin Ian King <colin.king@canonical.com>
  16 Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18
  19 ---
  20  drivers/phy/ti/phy-ti-pipe3.c |    2 +-
  21  1 file changed, 1 insertion(+), 1 deletion(-)
  22
  23 --- a/drivers/phy/ti/phy-ti-pipe3.c
  24 +++ b/drivers/phy/ti/phy-ti-pipe3.c
  25 @@ -303,7 +303,7 @@ static void ti_pipe3_calibrate(struct ti
  26
  27         val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_ANA_PROGRAMMABILITY);
  28         val &= ~(INTERFACE_MASK | LOSD_MASK | MEM_PLLDIV);
  29 -       val = (0x1 << INTERFACE_SHIFT | 0xA << LOSD_SHIFT);
  30 +       val |= (0x1 << INTERFACE_SHIFT | 0xA << LOSD_SHIFT);
  31         ti_pipe3_writel(phy->phy_rx, PCIEPHYRX_ANA_PROGRAMMABILITY, val);
  32
  33         val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_DIGITAL_MODES);