sunxi: remove 3.13 support

[openwrt/svn-archive/archive.git] / target / linux / sunxi / patches-3.13 / 162-2-ahci-plat-manage-sata-phy.patch

diff --git a/target/linux/sunxi/patches-3.13/162-2-ahci-plat-manage-sata-phy.patch b/target/linux/sunxi/patches-3.13/162-2-ahci-plat-manage-sata-phy.patch
deleted file mode 100644 (file)
index 1ab704b..0000000
--- a/target/linux/sunxi/patches-3.13/162-2-ahci-plat-manage-sata-phy.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 154a670a945c54300749d5ba008f30bbd6089017 Mon Sep 17 00:00:00 2001
-From: Roger Quadros <rogerq@ti.com>
-Date: Mon, 27 Jan 2014 16:41:18 +0200
-Subject: [PATCH] ata: ahci_platform: Manage SATA PHY
-
-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.
-
-CC: Balaji T K <balajitk@ti.com>
-Signed-off-by: Roger Quadros <rogerq@ti.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/ata/ahci.h          |  2 ++
- drivers/ata/ahci_platform.c | 47 +++++++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 47 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
-index bf8100c..3ab7ac9 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>
- #include <linux/regulator/consumer.h>
- 
- /* Enclosure Management Control */
-@@ -325,6 +326,7 @@ struct ahci_host_priv {
-       u32                     em_msg_type;    /* EM message type */
-       struct clk              *clks[AHCI_MAX_CLKS]; /* Optional */
-       struct regulator        *target_pwr;    /* Optional */
-+      struct phy              *phy;           /* If platform uses phy */
-       void                    *plat_data;     /* Other platform data */
-       /*
-        * Optional ahci_start_engine override, if not set this gets set to the
-diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
-index d7e55ba..99d38c1 100644
---- a/drivers/ata/ahci_platform.c
-+++ b/drivers/ata/ahci_platform.c
-@@ -23,6 +23,7 @@
- #include <linux/platform_device.h>
- #include <linux/libata.h>
- #include <linux/ahci_platform.h>
-+#include <linux/phy/phy.h>
- #include "ahci.h"
- 
- static void ahci_host_stop(struct ata_host *host);
-@@ -147,6 +148,7 @@ void ahci_platform_disable_clks(struct ahci_host_priv *hpriv)
-  *    the following order:
-  *    1) Regulator
-  *    2) Clocks (through ahci_platform_enable_clks)
-+ *    3) Phy
-  *
-  *    If resource enabling fails at any point the previous enabled
-  *    resources are disabled in reverse order.
-@@ -171,8 +173,23 @@ int ahci_platform_enable_resources(struct ahci_host_priv *hpriv)
-       if (rc)
-               goto disable_regulator;
- 
-+      if (hpriv->phy) {
-+              rc = phy_init(hpriv->phy);
-+              if (rc)
-+                      goto disable_clks;
-+
-+              rc = phy_power_on(hpriv->phy);
-+              if (rc) {
-+                      phy_exit(hpriv->phy);
-+                      goto disable_clks;
-+              }
-+      }
-+
-       return 0;
- 
-+disable_clks:
-+      ahci_platform_disable_clks(hpriv);
-+
- disable_regulator:
-       if (hpriv->target_pwr)
-               regulator_disable(hpriv->target_pwr);
-@@ -186,14 +203,20 @@ int ahci_platform_enable_resources(struct ahci_host_priv *hpriv)
-  *
-  *    This function disables all ahci_platform managed resources in
-  *    the following order:
-- *    1) Clocks (through ahci_platform_disable_clks)
-- *    2) Regulator
-+ *    1) Phy
-+ *    2) Clocks (through ahci_platform_disable_clks)
-+ *    3) Regulator
-  *
-  *    LOCKING:
-  *    None.
-  */
- void ahci_platform_disable_resources(struct ahci_host_priv *hpriv)
- {
-+      if (hpriv->phy) {
-+              phy_power_off(hpriv->phy);
-+              phy_exit(hpriv->phy);
-+      }
-+
-       ahci_platform_disable_clks(hpriv);
- 
-       if (hpriv->target_pwr)
-@@ -222,6 +245,7 @@ static void ahci_platform_put_resources(struct device *dev, void *res)
-  *    2) regulator for controlling the targets power (optional)
-  *    3) 0 - AHCI_MAX_CLKS clocks, as specified in the devs devicetree node,
-  *       or for non devicetree enabled platforms a single clock
-+ *    4) phy (optional)
-  *
-  *    LOCKING:
-  *    None.
-@@ -283,6 +307,25 @@ struct ahci_host_priv *ahci_platform_get_resources(
-               hpriv->clks[i] = clk;
-       }
- 
-+      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 err_out;
-+
-+              default:
-+                      dev_err(dev, "couldn't get sata-phy\n");
-+                      goto err_out;
-+              }
-+      }
-+
-       devres_remove_group(dev, NULL);
-       return hpriv;
- 
--- 
-1.8.5.5
-