diff options
author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2019-12-18 16:13:38 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-12-18 16:13:38 +0000 |
commit | 90a76bab2f649c9b879b71bfe80fba1b5e8278f2 (patch) | |
tree | 2be04504e23a03242a4c41d39855c4ffca87b763 | |
parent | 4962385ec253e18a78994205b72eae2e64ec3647 (diff) | |
parent | b662232d189af5289c8810c628da1640b70ae352 (diff) | |
download | trusted-firmware-a-90a76bab2f649c9b879b71bfe80fba1b5e8278f2.tar.gz |
Merge "drivers: marvell: comphy-a3700: fix USB3 powering on when on lane 2" into integration
-rw-r--r-- | drivers/marvell/comphy/phy-comphy-3700.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/marvell/comphy/phy-comphy-3700.c b/drivers/marvell/comphy/phy-comphy-3700.c index 2e8c4128e7..fa5183bc5f 100644 --- a/drivers/marvell/comphy/phy-comphy-3700.c +++ b/drivers/marvell/comphy/phy-comphy-3700.c @@ -721,11 +721,11 @@ static int mvebu_a3700_comphy_usb3_power_on(uint8_t comphy_index, udelay(PLL_SET_DELAY_US); if (comphy_index == COMPHY_LANE2) { - data = COMPHY_LOOPBACK_REG0 + USB3PHY_LANE2_REG_BASE_OFFSET; + data = COMPHY_REG_LANE_STATUS1_ADDR + USB3PHY_LANE2_REG_BASE_OFFSET; mmio_write_32(reg_base + COMPHY_LANE2_INDIR_ADDR_OFFSET, data); - addr = COMPHY_LOOPBACK_REG0 + USB3PHY_LANE2_REG_BASE_OFFSET; + addr = reg_base + COMPHY_LANE2_INDIR_DATA_OFFSET; ret = polling_with_timeout(addr, TXDCLK_PCLK_EN, TXDCLK_PCLK_EN, COMPHY_PLL_TIMEOUT, REG_32BIT); } else { |