mmc: sdhci-of-arasan: keep consistent with upstream

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / sdhci-of-arasan.c

diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
index 75379cb0fb354e7aa7749852ced8fca5973d435e..4724ca489b3f3be61b20d41d113298abf0240e7d 100644 (file)
--- a/drivers/mmc/host/sdhci-of-arasan.c
+++ b/drivers/mmc/host/sdhci-of-arasan.c
@@ -21,6 +21,7 @@
 
 #include <linux/module.h>
 #include <linux/of_device.h>
+#include <linux/phy/phy.h>
 #include "sdhci-pltfm.h"
 
 #define SDHCI_ARASAN_CLK_CTRL_OFFSET   0x2c
@@ -32,9 +33,11 @@
 /**
  * struct sdhci_arasan_data
  * @clk_ahb:   Pointer to the AHB clock
+ * @phy: Pointer to the generic phy
  */
 struct sdhci_arasan_data {
        struct clk      *clk_ahb;
+       struct phy      *phy;
 };
 
 static unsigned int sdhci_arasan_get_timeout_clock(struct sdhci_host *host)
@@ -72,7 +75,7 @@ static struct sdhci_pltfm_data sdhci_arasan_pdata = {
 /**
  * sdhci_arasan_suspend - Suspend method for the driver
  * @dev:       Address of the device structure
- * Returns 0 on success and error value on error
+ * Return: 0 on success and error value on error
  *
  * Put the device in a low power state.
  */
@@ -88,6 +91,15 @@ static int sdhci_arasan_suspend(struct device *dev)
        if (ret)
                return ret;
 
+       if (!IS_ERR(sdhci_arasan->phy)) {
+               ret = phy_power_off(sdhci_arasan->phy);
+               if (ret) {
+                       dev_err(dev, "Cannot power off phy.\n");
+                       sdhci_resume_host(host);
+                       return ret;
+               }
+       }
+
        clk_disable(pltfm_host->clk);
        clk_disable(sdhci_arasan->clk_ahb);
 
@@ -97,7 +109,7 @@ static int sdhci_arasan_suspend(struct device *dev)
 /**
  * sdhci_arasan_resume - Resume method for the driver
  * @dev:       Address of the device structure
- * Returns 0 on success and error value on error
+ * Return: 0 on success and error value on error
  *
  * Resume operation after suspend
  */
@@ -118,10 +130,17 @@ static int sdhci_arasan_resume(struct device *dev)
        ret = clk_enable(pltfm_host->clk);
        if (ret) {
                dev_err(dev, "Cannot enable SD clock.\n");
-               clk_disable(sdhci_arasan->clk_ahb);
                return ret;
        }
 
+       if (!IS_ERR(sdhci_arasan->phy)) {
+               ret = phy_power_on(sdhci_arasan->phy);
+               if (ret) {
+                       dev_err(dev, "Cannot power on phy.\n");
+                       return ret;
+               }
+       }
+
        return sdhci_resume_host(host);
 }
 #endif /* ! CONFIG_PM_SLEEP */
@@ -145,19 +164,21 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
        sdhci_arasan->clk_ahb = devm_clk_get(&pdev->dev, "clk_ahb");
        if (IS_ERR(sdhci_arasan->clk_ahb)) {
                dev_err(&pdev->dev, "clk_ahb clock not found.\n");
-               return PTR_ERR(sdhci_arasan->clk_ahb);
+               ret = PTR_ERR(sdhci_arasan->clk_ahb);
+               goto err_pltfm_free;
        }
 
        clk_xin = devm_clk_get(&pdev->dev, "clk_xin");
        if (IS_ERR(clk_xin)) {
                dev_err(&pdev->dev, "clk_xin clock not found.\n");
-               return PTR_ERR(clk_xin);
+               ret = PTR_ERR(clk_xin);
+               goto err_pltfm_free;
        }
 
        ret = clk_prepare_enable(sdhci_arasan->clk_ahb);
        if (ret) {
                dev_err(&pdev->dev, "Unable to enable AHB clock.\n");
-               return ret;
+               goto err_pltfm_free;
        }
 
        ret = clk_prepare_enable(clk_xin);
@@ -188,31 +209,68 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
                goto clk_disable_all;
        }
 
+       sdhci_arasan->phy = ERR_PTR(-ENODEV);
+       if (of_device_is_compatible(pdev->dev.of_node,
+                                   "arasan,sdhci-5.1")) {
+               sdhci_arasan->phy = devm_phy_get(&pdev->dev,
+                                                "phy_arasan");
+               if (IS_ERR(sdhci_arasan->phy)) {
+                       ret = PTR_ERR(sdhci_arasan->phy);
+                       dev_err(&pdev->dev, "No phy for arasan,sdhci-5.1.\n");
+                       goto clk_disable_all;
+               }
+
+               ret = phy_init(sdhci_arasan->phy);
+               if (ret < 0) {
+                       dev_err(&pdev->dev, "phy_init err.\n");
+                       goto clk_disable_all;
+               }
+
+               ret = phy_power_on(sdhci_arasan->phy);
+               if (ret < 0) {
+                       dev_err(&pdev->dev, "phy_power_on err.\n");
+                       goto err_phy_power;
+               }
+       }
+
        ret = sdhci_add_host(host);
        if (ret)
-               goto err_pltfm_free;
+               goto err_add_host;
 
        return 0;
 
-err_pltfm_free:
-       sdhci_pltfm_free(pdev);
+err_add_host:
+       if (!IS_ERR(sdhci_arasan->phy))
+               phy_power_off(sdhci_arasan->phy);
+err_phy_power:
+       if (!IS_ERR(sdhci_arasan->phy))
+               phy_exit(sdhci_arasan->phy);
 clk_disable_all:
        clk_disable_unprepare(clk_xin);
 clk_dis_ahb:
        clk_disable_unprepare(sdhci_arasan->clk_ahb);
-
+err_pltfm_free:
+       sdhci_pltfm_free(pdev);
        return ret;
 }
 
 static int sdhci_arasan_remove(struct platform_device *pdev)
 {
+       int ret;
        struct sdhci_host *host = platform_get_drvdata(pdev);
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
        struct sdhci_arasan_data *sdhci_arasan = pltfm_host->priv;
 
+       if (!IS_ERR(sdhci_arasan->phy)) {
+               phy_power_off(sdhci_arasan->phy);
+               phy_exit(sdhci_arasan->phy);
+       }
+
+       ret = sdhci_pltfm_unregister(pdev);
+
        clk_disable_unprepare(sdhci_arasan->clk_ahb);
 
-       return sdhci_pltfm_unregister(pdev);
+       return ret;
 }
 
 static const struct of_device_id sdhci_arasan_of_match[] = {