diff options
| author | Greg Kroah-Hartman | 2017-10-23 14:24:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-10-23 14:24:37 +0200 |
| commit | 0520d37bb3d49f8e62e30c80b001e0003b3f3ca9 (patch) | |
| tree | decc3a87d59b4eec5ec8c8c9c3f8378c35a29c7b /drivers/phy/mediatek/phy-mtk-tphy.c | |
| parent | USB: Force disconnect Huawei 4G modem during suspend (diff) | |
| parent | Linux 4.14-rc6 (diff) | |
| download | kernel-qcow2-linux-0520d37bb3d49f8e62e30c80b001e0003b3f3ca9.tar.gz kernel-qcow2-linux-0520d37bb3d49f8e62e30c80b001e0003b3f3ca9.tar.xz kernel-qcow2-linux-0520d37bb3d49f8e62e30c80b001e0003b3f3ca9.zip | |
Merge 4.14-rc6 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/phy/mediatek/phy-mtk-tphy.c')
| -rw-r--r-- | drivers/phy/mediatek/phy-mtk-tphy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/phy/mediatek/phy-mtk-tphy.c b/drivers/phy/mediatek/phy-mtk-tphy.c index e3baad78521f..721a2a1c97ef 100644 --- a/drivers/phy/mediatek/phy-mtk-tphy.c +++ b/drivers/phy/mediatek/phy-mtk-tphy.c @@ -27,6 +27,7 @@ /* banks shared by multiple phys */ #define SSUSB_SIFSLV_V1_SPLLC 0x000 /* shared by u3 phys */ #define SSUSB_SIFSLV_V1_U2FREQ 0x100 /* shared by u2 phys */ +#define SSUSB_SIFSLV_V1_CHIP 0x300 /* shared by u3 phys */ /* u2 phy bank */ #define SSUSB_SIFSLV_V1_U2PHY_COM 0x000 /* u3/pcie/sata phy banks */ @@ -762,7 +763,7 @@ static void phy_v1_banks_init(struct mtk_tphy *tphy, case PHY_TYPE_USB3: case PHY_TYPE_PCIE: u3_banks->spllc = tphy->sif_base + SSUSB_SIFSLV_V1_SPLLC; - u3_banks->chip = NULL; + u3_banks->chip = tphy->sif_base + SSUSB_SIFSLV_V1_CHIP; u3_banks->phyd = instance->port_base + SSUSB_SIFSLV_V1_U3PHYD; u3_banks->phya = instance->port_base + SSUSB_SIFSLV_V1_U3PHYA; break; |