Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-26 23:04:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drivers: marvell: comphy-a3700: Fix configuring polarity invert bits

Browse source 
TXD_INVERT_BIT or RXD_INVERT_BIT needs to be set only in case when
appropriate polarity is inverted. Otherwise these bits should be
cleared.

Signed-off-by: Pali Rohár <pali@kernel.org>
Change-Id: I8b09fab883a7b995fd72a7d8ae6233f0fa07011b
This commit is contained in:
Pali Rohár 2021-03-24 16:34:45 +01:00
parent 9ad1031408
commit ee4c70ebb9
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/marvell/comphy/phy-comphy-3700.c
View file

@ -525,7 +525,8 @@ static int mvebu_a3700_comphy_sgmii_power_on(uint8_t comphy_index,
data |= TXD_INVERT_BIT; data |= TXD_INVERT_BIT;
if (invert & COMPHY_POLARITY_RXD_INVERT) if (invert & COMPHY_POLARITY_RXD_INVERT)
data |= RXD_INVERT_BIT; data |= RXD_INVERT_BIT;
reg_set16(SGMIIPHY_ADDR(COMPHY_SYNC_PATTERN_REG, sd_ip_addr), data, 0); mask = TXD_INVERT_BIT | RXD_INVERT_BIT;
reg_set16(SGMIIPHY_ADDR(COMPHY_SYNC_PATTERN_REG, sd_ip_addr), data, mask);
/* /*
* 17. Set PHY input ports PIN_PU_PLL, PIN_PU_TX and PIN_PU_RX to 1 to * 17. Set PHY input ports PIN_PU_PLL, PIN_PU_TX and PIN_PU_RX to 1 to
@ -746,12 +747,15 @@ static int mvebu_a3700_comphy_usb3_power_on(uint8_t comphy_index,
/* /*
* 13. Check the Polarity invert bit * 13. Check the Polarity invert bit
*/ */
if (invert & COMPHY_POLARITY_TXD_INVERT) data = 0U;
usb3_reg_set(reg_base, COMPHY_SYNC_PATTERN_REG, TXD_INVERT_BIT, if (invert & COMPHY_POLARITY_TXD_INVERT) {
TXD_INVERT_BIT, mode); data |= TXD_INVERT_BIT;
if (invert & COMPHY_POLARITY_RXD_INVERT) }
usb3_reg_set(reg_base, COMPHY_SYNC_PATTERN_REG, RXD_INVERT_BIT, if (invert & COMPHY_POLARITY_RXD_INVERT) {
RXD_INVERT_BIT, mode); data |= RXD_INVERT_BIT;
}
mask = TXD_INVERT_BIT | RXD_INVERT_BIT;
usb3_reg_set(reg_base, COMPHY_SYNC_PATTERN_REG, data, mask, mode);
/* /*
* 14. Set max speed generation to USB3.0 5Gbps * 14. Set max speed generation to USB3.0 5Gbps
@ -802,6 +806,7 @@ static int mvebu_a3700_comphy_pcie_power_on(uint8_t comphy_index,
{ {
int ret; int ret;
uint32_t ref_clk; uint32_t ref_clk;
uint32_t mask, data;
int invert = COMPHY_GET_POLARITY_INVERT(comphy_mode); int invert = COMPHY_GET_POLARITY_INVERT(comphy_mode);
debug_enter(); debug_enter();
@ -858,13 +863,15 @@ static int mvebu_a3700_comphy_pcie_power_on(uint8_t comphy_index,
SPEED_PLL_VALUE_16 | USE_MAX_PLL_RATE_BIT, REG_16_BIT_MASK); SPEED_PLL_VALUE_16 | USE_MAX_PLL_RATE_BIT, REG_16_BIT_MASK);
/* 10. Check the Polarity invert bit */ /* 10. Check the Polarity invert bit */
if (invert & COMPHY_POLARITY_TXD_INVERT) data = 0U;
reg_set16(SYNC_PATTERN_REG_ADDR(PCIE) + COMPHY_SD_ADDR, if (invert & COMPHY_POLARITY_TXD_INVERT) {
TXD_INVERT_BIT, 0x0); data |= TXD_INVERT_BIT;
}
if (invert & COMPHY_POLARITY_RXD_INVERT) if (invert & COMPHY_POLARITY_RXD_INVERT) {
reg_set16(SYNC_PATTERN_REG_ADDR(PCIE) + COMPHY_SD_ADDR, data |= RXD_INVERT_BIT;
RXD_INVERT_BIT, 0x0); }
mask = TXD_INVERT_BIT | RXD_INVERT_BIT;
reg_set16(SYNC_PATTERN_REG_ADDR(PCIE) + COMPHY_SD_ADDR, data, mask);
/* 11. Release SW reset */ /* 11. Release SW reset */
reg_set16(GLOB_PHY_CTRL0_ADDR(PCIE) + COMPHY_SD_ADDR, reg_set16(GLOB_PHY_CTRL0_ADDR(PCIE) + COMPHY_SD_ADDR,