devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	Maxime Ripard
	<maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: Oliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org>,
	Richard Zhu
	<Hong-Xing.Zhu-KZfg59tc24xl57MIdRCFDg@public.gmane.org>,
	Roger Quadros <rogerq-l0cyMroinI0@public.gmane.org>,
	Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
	linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
	Balaji T K <balajitk-l0cyMroinI0@public.gmane.org>,
	Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Subject: [PATCH v6 13/18] ata: ahci_platform: Manage SATA PHY
Date: Wed, 19 Feb 2014 13:01:55 +0100	[thread overview]
Message-ID: <1392811320-3132-14-git-send-email-hdegoede@redhat.com> (raw)
In-Reply-To: <1392811320-3132-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

From: Roger Quadros <rogerq-l0cyMroinI0@public.gmane.org>

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-l0cyMroinI0@public.gmane.org>
Signed-off-by: Roger Quadros <rogerq-l0cyMroinI0@public.gmane.org>
Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 drivers/ata/Kconfig         |  1 +
 drivers/ata/ahci_platform.c | 40 ++++++++++++++++++++++++++++++++++++++++
 include/linux/ahci.h        |  2 ++
 3 files changed, 43 insertions(+)

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index cc67cc0..96176f4 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -91,6 +91,7 @@ config SATA_AHCI
 
 config SATA_AHCI_PLATFORM
 	tristate "Platform AHCI SATA support"
+	depends on GENERIC_PHY || !GENERIC_PHY
 	help
 	  This option enables support for Platform AHCI Serial ATA
 	  controllers.
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index 962ec25..073931a 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);
@@ -131,8 +132,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);
@@ -142,6 +158,11 @@ EXPORT_SYMBOL_GPL(ahci_platform_enable_resources);
 
 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)
@@ -194,6 +215,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 free_clk;
+
+		default:
+			dev_err(dev, "couldn't get sata-phy\n");
+			goto free_clk;
+		}
+	}
+
 	return hpriv;
 
 free_clk:
diff --git a/include/linux/ahci.h b/include/linux/ahci.h
index ac69cdc..8fbe3d7 100644
--- a/include/linux/ahci.h
+++ b/include/linux/ahci.h
@@ -23,6 +23,7 @@
 
 #include <linux/clk.h>
 #include <linux/regulator/consumer.h>
+#include <linux/phy/phy.h>
 
 #define AHCI_MAX_CLKS		3
 
@@ -42,6 +43,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 */
 	void			(*start_engine)(struct ata_port *ap);
-- 
1.8.5.3

  parent reply	other threads:[~2014-02-19 12:01 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-19 12:01 [PATCH v6 00/18] ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver Hans de Goede
     [not found] ` <1392811320-3132-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2014-02-19 12:01   ` [PATCH v6 01/18] libahci: Allow drivers to override start_engine Hans de Goede
2014-02-19 14:42     ` Tejun Heo
2014-02-19 12:01   ` [PATCH v6 02/18] libahci: Move ahci_host_priv declaration to include/linux/ahci.h Hans de Goede
2014-02-19 12:01   ` [PATCH v6 03/18] ahci-platform: Pass ahci_host_priv ptr to ahci_platform_data init method Hans de Goede
2014-02-19 12:01   ` [PATCH v6 04/18] ahci-platform: Add support for devices with more then 1 clock Hans de Goede
     [not found]     ` <1392811320-3132-5-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2014-02-19 14:52       ` Tejun Heo
2014-03-20 12:28         ` Ben Dooks
2014-02-19 12:01   ` [PATCH v6 05/18] ahci-platform: Add support for an optional regulator for sata-target power Hans de Goede
2014-02-19 14:53     ` Tejun Heo
2014-02-19 12:01   ` [PATCH v6 06/18] ahci-platform: Add enable_ / disable_resources helper functions Hans de Goede
     [not found]     ` <1392811320-3132-7-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2014-02-19 14:55       ` Tejun Heo
2014-02-19 12:01   ` [PATCH v6 07/18] ahci-platform: "Library-ise" ahci_probe functionality Hans de Goede
     [not found]     ` <1392811320-3132-8-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2014-02-19 14:58       ` Tejun Heo
2014-02-19 12:01   ` [PATCH v6 08/18] ahci-platform: "Library-ise" suspend / resume functionality Hans de Goede
2014-02-19 12:01   ` [PATCH v6 09/18] ARM: sunxi: Add support for Allwinner SUNXi SoCs sata to ahci_platform Hans de Goede
2014-02-19 12:01   ` [PATCH v6 10/18] ahci-imx: Port to library-ised ahci_platform Hans de Goede
2014-02-19 12:01   ` [PATCH v6 11/18] ata: ahci_platform: Add DT compatible for Synopsis DWC AHCI controller Hans de Goede
2014-02-19 12:01   ` [PATCH v6 12/18] ata: ahci_platform: Update DT compatible list Hans de Goede
2014-02-19 12:01   ` Hans de Goede [this message]
2014-02-19 12:01   ` [PATCH v6 14/18] ata: ahci_platform: Add 'struct device' argument to ahci_platform_put_resources() Hans de Goede
2014-02-19 12:01   ` [PATCH v6 15/18] ata: ahci_platform: runtime resume the device before use Hans de Goede
2014-02-19 12:01   ` [PATCH v6 16/18] ARM: sun4i: dt: Remove grouping + simple-bus compatible for regulators Hans de Goede
2014-02-19 12:01   ` [PATCH v6 17/18] ARM: sun4i: dt: Add ahci / sata support Hans de Goede
     [not found]     ` <1392811320-3132-18-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2014-02-21 18:15       ` Maxime Ripard
2014-02-22 10:09         ` Hans de Goede
     [not found]           ` <53087755.3090608-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2014-02-22 17:15             ` Maxime Ripard
2014-02-22 19:10               ` Hans de Goede
     [not found]                 ` <5308F63E.3070300-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2014-03-03  9:33                   ` Maxime Ripard
2014-03-03 10:07                     ` Hans de Goede
2014-02-19 12:02   ` [PATCH v6 18/18] ARM: sun7i: " Hans de Goede
2014-02-19 15:02   ` [PATCH v6 00/18] ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver Tejun Heo
     [not found]     ` <20140219150249.GG10134-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org>
2014-02-19 15:26       ` Hans de Goede
     [not found]         ` <5304CD33.1080704-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2014-02-19 16:25           ` Tejun Heo
     [not found]             ` <20140219162511.GJ10134-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org>
2014-02-19 17:18               ` Hans de Goede
2014-02-19 17:42                 ` Tejun Heo
2014-02-19 17:20   ` Robert Nelson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392811320-3132-14-git-send-email-hdegoede@redhat.com \
    --to=hdegoede-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
    --cc=Hong-Xing.Zhu-KZfg59tc24xl57MIdRCFDg@public.gmane.org \
    --cc=balajitk-l0cyMroinI0@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
    --cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
    --cc=oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org \
    --cc=rogerq-l0cyMroinI0@public.gmane.org \
    --cc=tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).