| From e6577cb5103b7ca7c0204c0c86ef4af8aa6288f6 Mon Sep 17 00:00:00 2001 |
| From: Colin Ian King <colin.king@canonical.com> |
| Date: Tue, 19 Feb 2019 14:53:49 +0000 |
| Subject: phy: ti-pipe3: fix missing bit-wise or operator when assigning val |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/phy/ti/phy-ti-pipe3.c |
| +++ b/drivers/phy/ti/phy-ti-pipe3.c |
| @@ -303,7 +303,7 @@ static void ti_pipe3_calibrate(struct ti |
| |
| 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); |