diff options
author | Matt Pelland <mpelland@starry.com> | 2019-08-01 15:50:59 -0400 |
---|---|---|
committer | Kishon Vijay Abraham I <kishon@ti.com> | 2019-08-27 02:07:09 -0400 |
commit | 5af67635c36ed92ef172c7bbf4d711364bc3bdf7 (patch) | |
tree | 108b037e0df6aad856f35eb203ca81cc16ad7582 | |
parent | f2a857aa2ad7335a54bd7b306ce02488eb269d58 (diff) |
phy: marvell: phy-mvebu-cp110-comphy: rename instances of DLT
The documentation for Marvell's cp110 phy refers to these
registers/register regions as DTL control, DTL frequency loop enable,
etc. This patch aligns the relevant code for these accordingly.
Signed-off-by: Matt Pelland <mpelland@starry.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
-rw-r--r-- | drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c index 091b2f3e5005..e3b87c94aaf6 100644 --- a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c +++ b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c | |||
@@ -80,8 +80,8 @@ | |||
80 | #define MVEBU_COMPHY_TX_SLEW_RATE(n) (0x974 + (n) * 0x1000) | 80 | #define MVEBU_COMPHY_TX_SLEW_RATE(n) (0x974 + (n) * 0x1000) |
81 | #define MVEBU_COMPHY_TX_SLEW_RATE_EMPH(n) ((n) << 5) | 81 | #define MVEBU_COMPHY_TX_SLEW_RATE_EMPH(n) ((n) << 5) |
82 | #define MVEBU_COMPHY_TX_SLEW_RATE_SLC(n) ((n) << 10) | 82 | #define MVEBU_COMPHY_TX_SLEW_RATE_SLC(n) ((n) << 10) |
83 | #define MVEBU_COMPHY_DLT_CTRL(n) (0x984 + (n) * 0x1000) | 83 | #define MVEBU_COMPHY_DTL_CTRL(n) (0x984 + (n) * 0x1000) |
84 | #define MVEBU_COMPHY_DLT_CTRL_DTL_FLOOP_EN BIT(2) | 84 | #define MVEBU_COMPHY_DTL_CTRL_DTL_FLOOP_EN BIT(2) |
85 | #define MVEBU_COMPHY_FRAME_DETECT0(n) (0xa14 + (n) * 0x1000) | 85 | #define MVEBU_COMPHY_FRAME_DETECT0(n) (0xa14 + (n) * 0x1000) |
86 | #define MVEBU_COMPHY_FRAME_DETECT0_PATN(n) ((n) << 7) | 86 | #define MVEBU_COMPHY_FRAME_DETECT0_PATN(n) ((n) << 7) |
87 | #define MVEBU_COMPHY_FRAME_DETECT3(n) (0xa20 + (n) * 0x1000) | 87 | #define MVEBU_COMPHY_FRAME_DETECT3(n) (0xa20 + (n) * 0x1000) |
@@ -494,9 +494,9 @@ static int mvebu_comphy_set_mode_sgmii(struct phy *phy) | |||
494 | val |= MVEBU_COMPHY_RX_CTRL1_RXCLK2X_SEL; | 494 | val |= MVEBU_COMPHY_RX_CTRL1_RXCLK2X_SEL; |
495 | writel(val, priv->base + MVEBU_COMPHY_RX_CTRL1(lane->id)); | 495 | writel(val, priv->base + MVEBU_COMPHY_RX_CTRL1(lane->id)); |
496 | 496 | ||
497 | val = readl(priv->base + MVEBU_COMPHY_DLT_CTRL(lane->id)); | 497 | val = readl(priv->base + MVEBU_COMPHY_DTL_CTRL(lane->id)); |
498 | val &= ~MVEBU_COMPHY_DLT_CTRL_DTL_FLOOP_EN; | 498 | val &= ~MVEBU_COMPHY_DTL_CTRL_DTL_FLOOP_EN; |
499 | writel(val, priv->base + MVEBU_COMPHY_DLT_CTRL(lane->id)); | 499 | writel(val, priv->base + MVEBU_COMPHY_DTL_CTRL(lane->id)); |
500 | 500 | ||
501 | regmap_read(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), &val); | 501 | regmap_read(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), &val); |
502 | val &= ~MVEBU_COMPHY_CONF1_USB_PCIE; | 502 | val &= ~MVEBU_COMPHY_CONF1_USB_PCIE; |
@@ -527,9 +527,9 @@ static int mvebu_comphy_set_mode_rxaui(struct phy *phy) | |||
527 | MVEBU_COMPHY_RX_CTRL1_CLK8T_EN; | 527 | MVEBU_COMPHY_RX_CTRL1_CLK8T_EN; |
528 | writel(val, priv->base + MVEBU_COMPHY_RX_CTRL1(lane->id)); | 528 | writel(val, priv->base + MVEBU_COMPHY_RX_CTRL1(lane->id)); |
529 | 529 | ||
530 | val = readl(priv->base + MVEBU_COMPHY_DLT_CTRL(lane->id)); | 530 | val = readl(priv->base + MVEBU_COMPHY_DTL_CTRL(lane->id)); |
531 | val |= MVEBU_COMPHY_DLT_CTRL_DLT_FLOOP_EN; | 531 | val |= MVEBU_COMPHY_DTL_CTRL_DTL_FLOOP_EN; |
532 | writel(val, priv->base + MVEBU_COMPHY_DLT_CTRL(lane->id)); | 532 | writel(val, priv->base + MVEBU_COMPHY_DTL_CTRL(lane->id)); |
533 | 533 | ||
534 | val = readl(priv->base + MVEBU_COMPHY_SERDES_CFG2(lane->id)); | 534 | val = readl(priv->base + MVEBU_COMPHY_SERDES_CFG2(lane->id)); |
535 | val |= MVEBU_COMPHY_SERDES_CFG2_DFE_EN; | 535 | val |= MVEBU_COMPHY_SERDES_CFG2_DFE_EN; |
@@ -580,9 +580,9 @@ static int mvebu_comphy_set_mode_10gkr(struct phy *phy) | |||
580 | MVEBU_COMPHY_RX_CTRL1_CLK8T_EN; | 580 | MVEBU_COMPHY_RX_CTRL1_CLK8T_EN; |
581 | writel(val, priv->base + MVEBU_COMPHY_RX_CTRL1(lane->id)); | 581 | writel(val, priv->base + MVEBU_COMPHY_RX_CTRL1(lane->id)); |
582 | 582 | ||
583 | val = readl(priv->base + MVEBU_COMPHY_DLT_CTRL(lane->id)); | 583 | val = readl(priv->base + MVEBU_COMPHY_DTL_CTRL(lane->id)); |
584 | val |= MVEBU_COMPHY_DLT_CTRL_DTL_FLOOP_EN; | 584 | val |= MVEBU_COMPHY_DTL_CTRL_DTL_FLOOP_EN; |
585 | writel(val, priv->base + MVEBU_COMPHY_DLT_CTRL(lane->id)); | 585 | writel(val, priv->base + MVEBU_COMPHY_DTL_CTRL(lane->id)); |
586 | 586 | ||
587 | /* Speed divider */ | 587 | /* Speed divider */ |
588 | val = readl(priv->base + MVEBU_COMPHY_SPEED_DIV(lane->id)); | 588 | val = readl(priv->base + MVEBU_COMPHY_SPEED_DIV(lane->id)); |