Merge tag 'gpio-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[cascardo/linux.git] / drivers / phy / phy-brcm-sata.c

diff --git a/drivers/phy/phy-brcm-sata.c b/drivers/phy/phy-brcm-sata.c
index 6c4c5cb..18d6626 100644 (file)
--- a/drivers/phy/phy-brcm-sata.c
+++ b/drivers/phy/phy-brcm-sata.c
@@ -45,6 +45,7 @@ enum brcm_sata_phy_version {
        BRCM_SATA_PHY_STB_28NM,
        BRCM_SATA_PHY_STB_40NM,
        BRCM_SATA_PHY_IPROC_NS2,
+       BRCM_SATA_PHY_IPROC_NSP,
 };
 
 struct brcm_sata_port {
@@ -73,6 +74,13 @@ enum sata_phy_regs {
 
        PLL_REG_BANK_0                          = 0x050,
        PLL_REG_BANK_0_PLLCONTROL_0             = 0x81,
+       PLLCONTROL_0_FREQ_DET_RESTART           = BIT(13),
+       PLLCONTROL_0_FREQ_MONITOR               = BIT(12),
+       PLLCONTROL_0_SEQ_START                  = BIT(15),
+       PLL_CAP_CONTROL                         = 0x85,
+       PLL_ACTRL2                              = 0x8b,
+       PLL_ACTRL2_SELDIV_MASK                  = 0x1f,
+       PLL_ACTRL2_SELDIV_SHIFT                 = 9,
 
        PLL1_REG_BANK                           = 0x060,
        PLL1_ACTRL2                             = 0x82,
@@ -80,6 +88,7 @@ enum sata_phy_regs {
        PLL1_ACTRL4                             = 0x84,
 
        OOB_REG_BANK                            = 0x150,
+       OOB1_REG_BANK                           = 0x160,
        OOB_CTRL1                               = 0x80,
        OOB_CTRL1_BURST_MAX_MASK                = 0xf,
        OOB_CTRL1_BURST_MAX_SHIFT               = 12,
@@ -271,6 +280,73 @@ static int brcm_ns2_sata_init(struct brcm_sata_port *port)
        return 0;
 }
 
+static int brcm_nsp_sata_init(struct brcm_sata_port *port)
+{
+       struct brcm_sata_phy *priv = port->phy_priv;
+       struct device *dev = port->phy_priv->dev;
+       void __iomem *base = priv->phy_base;
+       unsigned int oob_bank;
+       unsigned int val, try;
+
+       /* Configure OOB control */
+       if (port->portnum == 0)
+               oob_bank = OOB_REG_BANK;
+       else if (port->portnum == 1)
+               oob_bank = OOB1_REG_BANK;
+       else
+               return -EINVAL;
+
+       val = 0x0;
+       val |= (0x0f << OOB_CTRL1_BURST_MAX_SHIFT);
+       val |= (0x06 << OOB_CTRL1_BURST_MIN_SHIFT);
+       val |= (0x0f << OOB_CTRL1_WAKE_IDLE_MAX_SHIFT);
+       val |= (0x06 << OOB_CTRL1_WAKE_IDLE_MIN_SHIFT);
+       brcm_sata_phy_wr(base, oob_bank, OOB_CTRL1, 0x0, val);
+
+       val = 0x0;
+       val |= (0x2e << OOB_CTRL2_RESET_IDLE_MAX_SHIFT);
+       val |= (0x02 << OOB_CTRL2_BURST_CNT_SHIFT);
+       val |= (0x16 << OOB_CTRL2_RESET_IDLE_MIN_SHIFT);
+       brcm_sata_phy_wr(base, oob_bank, OOB_CTRL2, 0x0, val);
+
+
+       brcm_sata_phy_wr(base, PLL_REG_BANK_0, PLL_ACTRL2,
+               ~(PLL_ACTRL2_SELDIV_MASK << PLL_ACTRL2_SELDIV_SHIFT),
+               0x0c << PLL_ACTRL2_SELDIV_SHIFT);
+
+       brcm_sata_phy_wr(base, PLL_REG_BANK_0, PLL_CAP_CONTROL,
+                                               0xff0, 0x4f0);
+
+       val = PLLCONTROL_0_FREQ_DET_RESTART | PLLCONTROL_0_FREQ_MONITOR;
+       brcm_sata_phy_wr(base, PLL_REG_BANK_0, PLL_REG_BANK_0_PLLCONTROL_0,
+                                                               ~val, val);
+       val = PLLCONTROL_0_SEQ_START;
+       brcm_sata_phy_wr(base, PLL_REG_BANK_0, PLL_REG_BANK_0_PLLCONTROL_0,
+                                                               ~val, 0);
+       mdelay(10);
+       brcm_sata_phy_wr(base, PLL_REG_BANK_0, PLL_REG_BANK_0_PLLCONTROL_0,
+                                                               ~val, val);
+
+       /* Wait for pll_seq_done bit */
+       try = 50;
+       while (try--) {
+               val = brcm_sata_phy_rd(base, BLOCK0_REG_BANK,
+                                       BLOCK0_XGXSSTATUS);
+               if (val & BLOCK0_XGXSSTATUS_PLL_LOCK)
+                       break;
+               msleep(20);
+       }
+       if (!try) {
+               /* PLL did not lock; give up */
+               dev_err(dev, "port%d PLL did not lock\n", port->portnum);
+               return -ETIMEDOUT;
+       }
+
+       dev_dbg(dev, "port%d initialized\n", port->portnum);
+
+       return 0;
+}
+
 static int brcm_sata_phy_init(struct phy *phy)
 {
        int rc;
@@ -284,6 +360,9 @@ static int brcm_sata_phy_init(struct phy *phy)
        case BRCM_SATA_PHY_IPROC_NS2:
                rc = brcm_ns2_sata_init(port);
                break;
+       case BRCM_SATA_PHY_IPROC_NSP:
+               rc = brcm_nsp_sata_init(port);
+               break;
        default:
                rc = -ENODEV;
        };
@@ -303,6 +382,8 @@ static const struct of_device_id brcm_sata_phy_of_match[] = {
          .data = (void *)BRCM_SATA_PHY_STB_40NM },
        { .compatible   = "brcm,iproc-ns2-sata-phy",
          .data = (void *)BRCM_SATA_PHY_IPROC_NS2 },
+       { .compatible = "brcm,iproc-nsp-sata-phy",
+         .data = (void *)BRCM_SATA_PHY_IPROC_NSP },
        {},
 };
 MODULE_DEVICE_TABLE(of, brcm_sata_phy_of_match);