leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ahci-platform: Add support for an optional regulator for sata-target power

Browse Source 
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Hans de Goede 2014-02-22 16:53:32 +01:00 committed by Tejun Heo
parent 156c588794
commit 4b3e603a29
3 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/ata/ahci-platform.txt
View File

@ -11,6 +11,7 @@ Required properties:
Optional properties: Optional properties:
- dma-coherent : Present if dma operations are coherent - dma-coherent : Present if dma operations are coherent
- clocks : a list of phandle + clock specifier pairs - clocks : a list of phandle + clock specifier pairs
- target-supply : regulator for SATA target power
Example: Example:
sata@ffe08000 { sata@ffe08000 {

2
drivers/ata/ahci.h
View File

@ -37,6 +37,7 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/libata.h> #include <linux/libata.h>
#include <linux/regulator/consumer.h>
/* Enclosure Management Control */ /* Enclosure Management Control */
#define EM_CTRL_MSG_TYPE 0x000f0000 #define EM_CTRL_MSG_TYPE 0x000f0000
@ -323,6 +324,7 @@ struct ahci_host_priv {
u32 em_buf_sz; /* EM buffer size in byte */ u32 em_buf_sz; /* EM buffer size in byte */
u32 em_msg_type; /* EM message type */ u32 em_msg_type; /* EM message type */
struct clk *clks[AHCI_MAX_CLKS]; /* Optional */ struct clk *clks[AHCI_MAX_CLKS]; /* Optional */
struct regulator *target_pwr; /* Optional */
void *plat_data; /* Other platform data */ void *plat_data; /* Other platform data */
/* /*
* Optional ahci_start_engine override, if not set this gets set to the * Optional ahci_start_engine override, if not set this gets set to the

36
drivers/ata/ahci_platform.c
View File

@ -185,6 +185,14 @@ static int ahci_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
hpriv->target_pwr = devm_regulator_get_optional(dev, "target");
if (IS_ERR(hpriv->target_pwr)) {
rc = PTR_ERR(hpriv->target_pwr);
if (rc == -EPROBE_DEFER)
return -EPROBE_DEFER;
hpriv->target_pwr = NULL;
}
for (i = 0; i < AHCI_MAX_CLKS; i++) { for (i = 0; i < AHCI_MAX_CLKS; i++) {
/* /*
* For now we must use clk_get(dev, NULL) for the first clock, * For now we must use clk_get(dev, NULL) for the first clock,
@ -206,9 +214,15 @@ static int ahci_probe(struct platform_device *pdev)
hpriv->clks[i] = clk; hpriv->clks[i] = clk;
} }
if (hpriv->target_pwr) {
rc = regulator_enable(hpriv->target_pwr);
if (rc)
goto free_clk;
}
rc = ahci_enable_clks(dev, hpriv); rc = ahci_enable_clks(dev, hpriv);
if (rc) if (rc)
goto free_clk; goto disable_regulator;
/* /*
* Some platforms might need to prepare for mmio region access, * Some platforms might need to prepare for mmio region access,
@ -291,6 +305,9 @@ pdata_exit:
pdata->exit(dev); pdata->exit(dev);
disable_unprepare_clk: disable_unprepare_clk:
ahci_disable_clks(hpriv); ahci_disable_clks(hpriv);
disable_regulator:
if (hpriv->target_pwr)
regulator_disable(hpriv->target_pwr);
free_clk: free_clk:
ahci_put_clks(hpriv); ahci_put_clks(hpriv);
return rc; return rc;
@ -307,6 +324,9 @@ static void ahci_host_stop(struct ata_host *host)
ahci_disable_clks(hpriv); ahci_disable_clks(hpriv);
ahci_put_clks(hpriv); ahci_put_clks(hpriv);
if (hpriv->target_pwr)
regulator_disable(hpriv->target_pwr);
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
@ -343,6 +363,9 @@ static int ahci_suspend(struct device *dev)
ahci_disable_clks(hpriv); ahci_disable_clks(hpriv);
if (hpriv->target_pwr)
regulator_disable(hpriv->target_pwr);
return 0; return 0;
} }
@ -353,9 +376,15 @@ static int ahci_resume(struct device *dev)
struct ahci_host_priv *hpriv = host->private_data; struct ahci_host_priv *hpriv = host->private_data;
int rc; int rc;
if (hpriv->target_pwr) {
rc = regulator_enable(hpriv->target_pwr);
if (rc)
return rc;
}
rc = ahci_enable_clks(dev, hpriv); rc = ahci_enable_clks(dev, hpriv);
if (rc) if (rc)
return rc; goto disable_regulator;
if (pdata && pdata->resume) { if (pdata && pdata->resume) {
rc = pdata->resume(dev); rc = pdata->resume(dev);
@ -377,6 +406,9 @@ static int ahci_resume(struct device *dev)
disable_unprepare_clk: disable_unprepare_clk:
ahci_disable_clks(hpriv); ahci_disable_clks(hpriv);
disable_regulator:
if (hpriv->target_pwr)
regulator_disable(hpriv->target_pwr);
return rc; return rc;
} }