* [PATCH v6 0/2] Add phy support for arasan,sdhci-5.1
@ 2016-03-05 2:23 Shawn Lin
2016-03-05 2:24 ` [PATCH v6 1/2] Documentation: bindings: add description of phy for sdhci-of-arasan Shawn Lin
2016-03-05 2:24 ` [PATCH v6 2/2] mmc: sdhci-of-arasan: add phy support " Shawn Lin
0 siblings, 2 replies; 6+ messages in thread
From: Shawn Lin @ 2016-03-05 2:23 UTC (permalink / raw
To: Adrian Hunter, Ulf Hansson
Cc: Michal Simek, soren.brinkmann, Rob Herring, linux-mmc,
linux-kernel, devicetree, Shawn Lin
Phy is mandatory requirement for arasan,sdhci-5.1, so we introduce
generic phy support for sdhci-of-arasan.
This version is rebased on Ulf's next to make it applied cleanly.
Also, we fix some preexisting problems of err handling suggested by Adrian.
Shawn Lin (2):
Documentation: bindings: add description of phy for sdhci-of-arasan
mmc: sdhci-of-arasan: add phy support for sdhci-of-arasan
.../devicetree/bindings/mmc/arasan,sdhci.txt | 20 +++++-
drivers/mmc/host/sdhci-of-arasan.c | 71 +++++++++++++++++++---
2 files changed, 81 insertions(+), 10 deletions(-)
--
2.3.7
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v6 1/2] Documentation: bindings: add description of phy for sdhci-of-arasan
2016-03-05 2:23 [PATCH v6 0/2] Add phy support for arasan,sdhci-5.1 Shawn Lin
@ 2016-03-05 2:24 ` Shawn Lin
2016-03-05 2:24 ` [PATCH v6 2/2] mmc: sdhci-of-arasan: add phy support " Shawn Lin
1 sibling, 0 replies; 6+ messages in thread
From: Shawn Lin @ 2016-03-05 2:24 UTC (permalink / raw
To: Adrian Hunter, Ulf Hansson
Cc: Michal Simek, soren.brinkmann, Rob Herring, linux-mmc,
linux-kernel, devicetree, Shawn Lin
This patch adds phys and phy-names for sdhci-of-arasan as required
properties for arasan,sdhci-5.1, and details the example as well.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
---
Changes in v6:
- add Rob's Acked-by tag
Changes in v2:
- Keep phy as a mandatory requirement for arasan,sdhci-5.1
.../devicetree/bindings/mmc/arasan,sdhci.txt | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt b/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt
index da541c3..31b35c3 100644
--- a/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt
+++ b/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt
@@ -1,11 +1,12 @@
Device Tree Bindings for the Arasan SDHCI Controller
- The bindings follow the mmc[1], clock[2] and interrupt[3] bindings. Only
- deviations are documented here.
+ The bindings follow the mmc[1], clock[2], interrupt[3] and phy[4] bindings.
+ Only deviations are documented here.
[1] Documentation/devicetree/bindings/mmc/mmc.txt
[2] Documentation/devicetree/bindings/clock/clock-bindings.txt
[3] Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
+ [4] Documentation/devicetree/bindings/phy/phy-bindings.txt
Required Properties:
- compatible: Compatibility string. Must be 'arasan,sdhci-8.9a' or
@@ -17,6 +18,10 @@ Required Properties:
- interrupt-parent: Phandle for the interrupt controller that services
interrupts for this device.
+Required Properties for "arasan,sdhci-5.1":
+ - phys: From PHY bindings: Phandle for the Generic PHY for arasan.
+ - phy-names: MUST be "phy_arasan".
+
Example:
sdhci@e0100000 {
compatible = "arasan,sdhci-8.9a";
@@ -26,3 +31,14 @@ Example:
interrupt-parent = <&gic>;
interrupts = <0 24 4>;
} ;
+
+ sdhci@e2800000 {
+ compatible = "arasan,sdhci-5.1";
+ reg = <0xe2800000 0x1000>;
+ clock-names = "clk_xin", "clk_ahb";
+ clocks = <&cru 8>, <&cru 18>;
+ interrupt-parent = <&gic>;
+ interrupts = <0 24 4>;
+ phys = <&emmc_phy>;
+ phy-names = "phy_arasan";
+ } ;
--
2.3.7
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v6 2/2] mmc: sdhci-of-arasan: add phy support for sdhci-of-arasan
2016-03-05 2:23 [PATCH v6 0/2] Add phy support for arasan,sdhci-5.1 Shawn Lin
2016-03-05 2:24 ` [PATCH v6 1/2] Documentation: bindings: add description of phy for sdhci-of-arasan Shawn Lin
@ 2016-03-05 2:24 ` Shawn Lin
2016-03-07 12:07 ` Adrian Hunter
1 sibling, 1 reply; 6+ messages in thread
From: Shawn Lin @ 2016-03-05 2:24 UTC (permalink / raw
To: Adrian Hunter, Ulf Hansson
Cc: Michal Simek, soren.brinkmann, Rob Herring, linux-mmc,
linux-kernel, devicetree, Shawn Lin
This patch adds Generic PHY access for sdhci-of-arasan. Driver
can get PHY handler from dt-binding, and power-on/init the PHY.
Currently, it's just mandatory for arasan,sdhci-5.1.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Serise-changes: 6
- rebase on Ulf's next
- fix some preexisting problems of err handling suggested
by Adrian
Serise-changes: 5
- remove rpm support from this serise
- fix some err case for handling phy
Serise-changes: 4
- remove suspend/resume_phy
- add err handle label for system PM callback
- fix comments of struct sdhci_arasan_data and system PM
callback suggested by Michal
Serise-changes: 3
- remove phy_init/exit for suspend/resume
- adjust phy_int/power_on seq to make code more reasonable
simplify suspend/resume_phy
Serise-changes: 2
- Keep phy as a mandatory requirement for arasan,sdhci-5.1
---
Changes in v6: None
Changes in v2: None
drivers/mmc/host/sdhci-of-arasan.c | 71 +++++++++++++++++++++++++++++++++-----
1 file changed, 63 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
index 1e4b5e0..2e482b1 100644
--- 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)
@@ -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);
@@ -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 */
@@ -148,19 +167,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);
@@ -178,19 +199,48 @@ 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;
}
@@ -202,6 +252,11 @@ static int sdhci_arasan_remove(struct platform_device *pdev)
struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
struct clk *clk_ahb = sdhci_arasan->clk_ahb;
+ 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(clk_ahb);
--
2.3.7
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v6 2/2] mmc: sdhci-of-arasan: add phy support for sdhci-of-arasan
2016-03-05 2:24 ` [PATCH v6 2/2] mmc: sdhci-of-arasan: add phy support " Shawn Lin
@ 2016-03-07 12:07 ` Adrian Hunter
2016-03-07 12:48 ` Shawn Lin
0 siblings, 1 reply; 6+ messages in thread
From: Adrian Hunter @ 2016-03-07 12:07 UTC (permalink / raw
To: Shawn Lin, Ulf Hansson
Cc: Michal Simek, soren.brinkmann, Rob Herring, linux-mmc,
linux-kernel, devicetree
On 05/03/16 04:24, Shawn Lin wrote:
> This patch adds Generic PHY access for sdhci-of-arasan. Driver
> can get PHY handler from dt-binding, and power-on/init the PHY.
> Currently, it's just mandatory for arasan,sdhci-5.1.
>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
>
> Serise-changes: 6
> - rebase on Ulf's next
> - fix some preexisting problems of err handling suggested
> by Adrian
>
> Serise-changes: 5
> - remove rpm support from this serise
> - fix some err case for handling phy
>
> Serise-changes: 4
> - remove suspend/resume_phy
> - add err handle label for system PM callback
> - fix comments of struct sdhci_arasan_data and system PM
> callback suggested by Michal
>
> Serise-changes: 3
> - remove phy_init/exit for suspend/resume
> - adjust phy_int/power_on seq to make code more reasonable
> simplify suspend/resume_phy
>
> Serise-changes: 2
> - Keep phy as a mandatory requirement for arasan,sdhci-5.1
>
It looks good, but, sorry to be a pain, the fixes to the error handling
really have to be separate patches. I would make a separate patch for
removing clk_disable(sdhci_arasan->clk_ahb) from sdhci_arasan_resume() and
another for the error handling fixes in sdhci_arasan_probe().
By the way, those "Serise-changes" should not be in the commit msg.
> ---
>
> Changes in v6: None
> Changes in v2: None
>
> drivers/mmc/host/sdhci-of-arasan.c | 71 +++++++++++++++++++++++++++++++++-----
> 1 file changed, 63 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
> index 1e4b5e0..2e482b1 100644
> --- 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)
> @@ -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);
>
> @@ -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 */
> @@ -148,19 +167,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);
> @@ -178,19 +199,48 @@ 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;
> }
>
> @@ -202,6 +252,11 @@ static int sdhci_arasan_remove(struct platform_device *pdev)
> struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
> struct clk *clk_ahb = sdhci_arasan->clk_ahb;
>
> + 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(clk_ahb);
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v6 2/2] mmc: sdhci-of-arasan: add phy support for sdhci-of-arasan
2016-03-07 12:07 ` Adrian Hunter
@ 2016-03-07 12:48 ` Shawn Lin
2016-03-07 13:39 ` Adrian Hunter
0 siblings, 1 reply; 6+ messages in thread
From: Shawn Lin @ 2016-03-07 12:48 UTC (permalink / raw
To: Adrian Hunter
Cc: Ulf Hansson, shawn.lin, Michal Simek, soren.brinkmann,
Rob Herring, linux-mmc, linux-kernel, devicetree
在 2016/3/7 20:07, Adrian Hunter 写道:
> On 05/03/16 04:24, Shawn Lin wrote:
>> This patch adds Generic PHY access for sdhci-of-arasan. Driver
>> can get PHY handler from dt-binding, and power-on/init the PHY.
>> Currently, it's just mandatory for arasan,sdhci-5.1.
>>
>> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
>>
>> Serise-changes: 6
>> - rebase on Ulf's next
>> - fix some preexisting problems of err handling suggested
>> by Adrian
>>
>> Serise-changes: 5
>> - remove rpm support from this serise
>> - fix some err case for handling phy
>>
>> Serise-changes: 4
>> - remove suspend/resume_phy
>> - add err handle label for system PM callback
>> - fix comments of struct sdhci_arasan_data and system PM
>> callback suggested by Michal
>>
>> Serise-changes: 3
>> - remove phy_init/exit for suspend/resume
>> - adjust phy_int/power_on seq to make code more reasonable
>> simplify suspend/resume_phy
>>
>> Serise-changes: 2
>> - Keep phy as a mandatory requirement for arasan,sdhci-5.1
>>
>
>
> It looks good, but, sorry to be a pain, the fixes to the error handling
> really have to be separate patches. I would make a separate patch for
> removing clk_disable(sdhci_arasan->clk_ahb) from sdhci_arasan_resume() and
> another for the error handling fixes in sdhci_arasan_probe().
Thanks. Does that mean you will split these two changes out of this
single patch by youself? ：）
>
> By the way, those "Serise-changes" should not be in the commit msg.
My fault, sorry for forgeting to check the format after generating it by
patman.py
>
>> ---
>>
>> Changes in v6: None
>> Changes in v2: None
>>
>> drivers/mmc/host/sdhci-of-arasan.c | 71 +++++++++++++++++++++++++++++++++-----
>> 1 file changed, 63 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
>> index 1e4b5e0..2e482b1 100644
>> --- 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)
>> @@ -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);
>>
>> @@ -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 */
>> @@ -148,19 +167,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);
>> @@ -178,19 +199,48 @@ 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;
>> }
>>
>> @@ -202,6 +252,11 @@ static int sdhci_arasan_remove(struct platform_device *pdev)
>> struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
>> struct clk *clk_ahb = sdhci_arasan->clk_ahb;
>>
>> + 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(clk_ahb);
>>
>
>
>
>
--
Best Regards
Shawn Lin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v6 2/2] mmc: sdhci-of-arasan: add phy support for sdhci-of-arasan
2016-03-07 12:48 ` Shawn Lin
@ 2016-03-07 13:39 ` Adrian Hunter
0 siblings, 0 replies; 6+ messages in thread
From: Adrian Hunter @ 2016-03-07 13:39 UTC (permalink / raw
To: Shawn Lin
Cc: Ulf Hansson, Michal Simek, soren.brinkmann, Rob Herring,
linux-mmc, linux-kernel, devicetree
On 07/03/16 14:48, Shawn Lin wrote:
> 在 2016/3/7 20:07, Adrian Hunter 写道:
>> On 05/03/16 04:24, Shawn Lin wrote:
>>> This patch adds Generic PHY access for sdhci-of-arasan. Driver
>>> can get PHY handler from dt-binding, and power-on/init the PHY.
>>> Currently, it's just mandatory for arasan,sdhci-5.1.
>>>
>>> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
>>>
>>> Serise-changes: 6
>>> - rebase on Ulf's next
>>> - fix some preexisting problems of err handling suggested
>>> by Adrian
>>>
>>> Serise-changes: 5
>>> - remove rpm support from this serise
>>> - fix some err case for handling phy
>>>
>>> Serise-changes: 4
>>> - remove suspend/resume_phy
>>> - add err handle label for system PM callback
>>> - fix comments of struct sdhci_arasan_data and system PM
>>> callback suggested by Michal
>>>
>>> Serise-changes: 3
>>> - remove phy_init/exit for suspend/resume
>>> - adjust phy_int/power_on seq to make code more reasonable
>>> simplify suspend/resume_phy
>>>
>>> Serise-changes: 2
>>> - Keep phy as a mandatory requirement for arasan,sdhci-5.1
>>>
>>
>>
>> It looks good, but, sorry to be a pain, the fixes to the error handling
>> really have to be separate patches. I would make a separate patch for
>> removing clk_disable(sdhci_arasan->clk_ahb) from sdhci_arasan_resume() and
>> another for the error handling fixes in sdhci_arasan_probe().
>
> Thanks. Does that mean you will split these two changes out of this
> single patch by youself? ：）
You need to do it. I am just Ack/Nack'ing at the moment.
>
>>
>> By the way, those "Serise-changes" should not be in the commit msg.
>
> My fault, sorry for forgeting to check the format after generating it by
> patman.py
>
>>
>>> ---
>>>
>>> Changes in v6: None
>>> Changes in v2: None
>>>
>>> drivers/mmc/host/sdhci-of-arasan.c | 71
>>> +++++++++++++++++++++++++++++++++-----
>>> 1 file changed, 63 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/drivers/mmc/host/sdhci-of-arasan.c
>>> b/drivers/mmc/host/sdhci-of-arasan.c
>>> index 1e4b5e0..2e482b1 100644
>>> --- 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)
>>> @@ -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);
>>>
>>> @@ -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 */
>>> @@ -148,19 +167,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);
>>> @@ -178,19 +199,48 @@ 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;
>>> }
>>>
>>> @@ -202,6 +252,11 @@ static int sdhci_arasan_remove(struct
>>> platform_device *pdev)
>>> struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
>>> struct clk *clk_ahb = sdhci_arasan->clk_ahb;
>>>
>>> + 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(clk_ahb);
>>>
>>
>>
>>
>>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-03-07 13:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-05 2:23 [PATCH v6 0/2] Add phy support for arasan,sdhci-5.1 Shawn Lin
2016-03-05 2:24 ` [PATCH v6 1/2] Documentation: bindings: add description of phy for sdhci-of-arasan Shawn Lin
2016-03-05 2:24 ` [PATCH v6 2/2] mmc: sdhci-of-arasan: add phy support " Shawn Lin
2016-03-07 12:07 ` Adrian Hunter
2016-03-07 12:48 ` Shawn Lin
2016-03-07 13:39 ` Adrian Hunter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.