Merge branches 'pm-core', 'powercap' and 'pm-tools'

[linux-beck.git] / drivers / phy / phy-brcmstb-sata.c

diff --git a/drivers/phy/phy-brcmstb-sata.c b/drivers/phy/phy-brcmstb-sata.c
index cd9dba8205668d98665d938b13a5e254b74bdb17..a23172ff40e318aeaf21ed55389f1893290867a0 100644 (file)
--- a/drivers/phy/phy-brcmstb-sata.c
+++ b/drivers/phy/phy-brcmstb-sata.c
@@ -26,13 +26,21 @@
 
 #define SATA_MDIO_BANK_OFFSET                          0x23c
 #define SATA_MDIO_REG_OFFSET(ofs)                      ((ofs) * 4)
-#define SATA_MDIO_REG_SPACE_SIZE                       0x1000
-#define SATA_MDIO_REG_LENGTH                           0x1f00
 
 #define MAX_PORTS                                      2
 
 /* Register offset between PHYs in PCB space */
-#define SATA_MDIO_REG_SPACE_SIZE                       0x1000
+#define SATA_MDIO_REG_28NM_SPACE_SIZE                  0x1000
+
+/* The older SATA PHY registers duplicated per port registers within the map,
+ * rather than having a separate map per port.
+ */
+#define SATA_MDIO_REG_40NM_SPACE_SIZE                  0x10
+
+enum brcm_sata_phy_version {
+       BRCM_SATA_PHY_28NM,
+       BRCM_SATA_PHY_40NM,
+};
 
 struct brcm_sata_port {
        int portnum;
@@ -44,11 +52,12 @@ struct brcm_sata_port {
 struct brcm_sata_phy {
        struct device *dev;
        void __iomem *phy_base;
+       enum brcm_sata_phy_version version;
 
        struct brcm_sata_port phys[MAX_PORTS];
 };
 
-enum sata_mdio_phy_regs_28nm {
+enum sata_mdio_phy_regs {
        PLL_REG_BANK_0                          = 0x50,
        PLL_REG_BANK_0_PLLCONTROL_0             = 0x81,
 
@@ -66,8 +75,16 @@ enum sata_mdio_phy_regs_28nm {
 static inline void __iomem *brcm_sata_phy_base(struct brcm_sata_port *port)
 {
        struct brcm_sata_phy *priv = port->phy_priv;
+       u32 offset = 0;
+
+       if (priv->version == BRCM_SATA_PHY_28NM)
+               offset = SATA_MDIO_REG_28NM_SPACE_SIZE;
+       else if (priv->version == BRCM_SATA_PHY_40NM)
+               offset = SATA_MDIO_REG_40NM_SPACE_SIZE;
+       else
+               dev_err(priv->dev, "invalid phy version\n");
 
-       return priv->phy_base + (port->portnum * SATA_MDIO_REG_SPACE_SIZE);
+       return priv->phy_base + (port->portnum * offset);
 }
 
 static void brcm_sata_mdio_wr(void __iomem *addr, u32 bank, u32 ofs,
@@ -86,7 +103,7 @@ static void brcm_sata_mdio_wr(void __iomem *addr, u32 bank, u32 ofs,
 #define FMAX_VAL_DEFAULT       0x3df
 #define FMAX_VAL_SSC           0x83
 
-static void brcm_sata_cfg_ssc_28nm(struct brcm_sata_port *port)
+static void brcm_sata_cfg_ssc(struct brcm_sata_port *port)
 {
        void __iomem *base = brcm_sata_phy_base(port);
        struct brcm_sata_phy *priv = port->phy_priv;
@@ -117,18 +134,21 @@ static int brcm_sata_phy_init(struct phy *phy)
 {
        struct brcm_sata_port *port = phy_get_drvdata(phy);
 
-       brcm_sata_cfg_ssc_28nm(port);
+       brcm_sata_cfg_ssc(port);
 
        return 0;
 }
 
-static const struct phy_ops phy_ops_28nm = {
+static const struct phy_ops phy_ops = {
        .init           = brcm_sata_phy_init,
        .owner          = THIS_MODULE,
 };
 
 static const struct of_device_id brcm_sata_phy_of_match[] = {
-       { .compatible   = "brcm,bcm7445-sata-phy" },
+       { .compatible   = "brcm,bcm7445-sata-phy",
+         .data = (void *)BRCM_SATA_PHY_28NM },
+       { .compatible   = "brcm,bcm7425-sata-phy",
+         .data = (void *)BRCM_SATA_PHY_40NM },
        {},
 };
 MODULE_DEVICE_TABLE(of, brcm_sata_phy_of_match);
@@ -137,6 +157,7 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct device_node *dn = dev->of_node, *child;
+       const struct of_device_id *of_id;
        struct brcm_sata_phy *priv;
        struct resource *res;
        struct phy_provider *provider;
@@ -156,6 +177,12 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
        if (IS_ERR(priv->phy_base))
                return PTR_ERR(priv->phy_base);
 
+       of_id = of_match_node(brcm_sata_phy_of_match, dn);
+       if (of_id)
+               priv->version = (enum brcm_sata_phy_version)of_id->data;
+       else
+               priv->version = BRCM_SATA_PHY_28NM;
+
        for_each_available_child_of_node(dn, child) {
                unsigned int id;
                struct brcm_sata_port *port;
@@ -181,7 +208,7 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
                port = &priv->phys[id];
                port->portnum = id;
                port->phy_priv = priv;
-               port->phy = devm_phy_create(dev, child, &phy_ops_28nm);
+               port->phy = devm_phy_create(dev, child, &phy_ops);
                port->ssc_en = of_property_read_bool(child, "brcm,enable-ssc");
                if (IS_ERR(port->phy)) {
                        dev_err(dev, "failed to create PHY\n");