On Thursday 09 January 2014 04:26 PM, Roger Quadros wrote: > From: Balaji T K <balajitk@xxxxxx> > > Some platforms have a PHY hooked up to the > SATA controller. The PHY needs to be initialized > and powered up for SATA to work. We do that > using the PHY framework. > > [Roger Q] Cleaned up. > > CC: Tejun Heo <tj@xxxxxxxxxx> > Signed-off-by: Balaji T K <balajitk@xxxxxx> > Signed-off-by: Roger Quadros <rogerq@xxxxxx> Acked-by: Kishon Vijay Abraham I <kishon@xxxxxx> > --- > drivers/ata/ahci.h | 2 ++ > drivers/ata/ahci_platform.c | 46 ++++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 47 insertions(+), 1 deletion(-) > > diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h > index 2289efd..f9bbada 100644 > --- a/drivers/ata/ahci.h > +++ b/drivers/ata/ahci.h > @@ -37,6 +37,7 @@ > > #include <linux/clk.h> > #include <linux/libata.h> > +#include <linux/phy/phy.h> > > /* Enclosure Management Control */ > #define EM_CTRL_MSG_TYPE 0x000f0000 > @@ -322,6 +323,7 @@ struct ahci_host_priv { > u32 em_buf_sz; /* EM buffer size in byte */ > u32 em_msg_type; /* EM message type */ > struct clk *clk; /* Only for platforms supporting clk */ > + struct phy *phy; /* If platform uses phy */ > void *plat_data; /* Other platform data */ > }; > > diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c > index d5ced13..b476642 100644 > --- a/drivers/ata/ahci_platform.c > +++ b/drivers/ata/ahci_platform.c > @@ -142,6 +142,39 @@ static int ahci_probe(struct platform_device *pdev) > } > } > > + hpriv->phy = devm_phy_get(dev, "sata-phy"); > + if (IS_ERR(hpriv->phy)) { > + rc = PTR_ERR(hpriv->phy); > + switch (rc) { > + case -ENODEV: > + case -ENOSYS: > + /* continue normally */ > + hpriv->phy = NULL; > + break; > + > + case -EPROBE_DEFER: > + goto disable_unprepare_clk; > + break; > + > + default: > + dev_err(dev, "couldn't get sata-phy\n"); > + goto disable_unprepare_clk; > + break; > + } > + } > + > + if (hpriv->phy) { > + rc = phy_init(hpriv->phy); > + if (rc) > + goto disable_unprepare_clk; > + > + rc = phy_power_on(hpriv->phy); > + if (rc) { > + phy_exit(hpriv->phy); > + goto disable_unprepare_clk; > + } > + } > + > /* > * Some platforms might need to prepare for mmio region access, > * which could be done in the following init call. So, the mmio > @@ -151,7 +184,7 @@ static int ahci_probe(struct platform_device *pdev) > if (pdata && pdata->init) { > rc = pdata->init(dev, hpriv->mmio); > if (rc) > - goto disable_unprepare_clk; > + goto disable_phy; > } > > ahci_save_initial_config(dev, hpriv, > @@ -221,6 +254,12 @@ static int ahci_probe(struct platform_device *pdev) > pdata_exit: > if (pdata && pdata->exit) > pdata->exit(dev); > +disable_phy: > + if (hpriv->phy) { > + phy_power_off(hpriv->phy); > + phy_exit(hpriv->phy); > + } > + > disable_unprepare_clk: > if (!IS_ERR(hpriv->clk)) > clk_disable_unprepare(hpriv->clk); > @@ -239,6 +278,11 @@ static void ahci_host_stop(struct ata_host *host) > if (pdata && pdata->exit) > pdata->exit(dev); > > + if (hpriv->phy) { > + phy_power_off(hpriv->phy); > + phy_exit(hpriv->phy); > + } > + > if (!IS_ERR(hpriv->clk)) { > clk_disable_unprepare(hpriv->clk); > clk_put(hpriv->clk); > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html