2017-07-19 15:45:32

by Philipp Zabel

Subject: [PATCH 058/102] phy: rockchip-pcie: explicitly request exclusive reset control

Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting
reset lines") started to transition the reset control request API calls
to explicitly state whether the driver needs exclusive or shared reset
control behavior. Convert all drivers requesting exclusive resets to the
explicit API call so the temporary transition helpers can be removed.

No functional changes.

Cc: Kishon Vijay Abraham I <[email protected]>
Cc: Heiko Stuebner <[email protected]>
Cc: [email protected]
Signed-off-by: Philipp Zabel <[email protected]>
---
drivers/phy/rockchip/phy-rockchip-pcie.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
index 6904633cad687..258220b7f481c 100644
--- a/drivers/phy/rockchip/phy-rockchip-pcie.c
+++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
@@ -305,7 +305,7 @@ static int rockchip_pcie_phy_probe(struct platform_device *pdev)
rk_phy->phy_data = (struct rockchip_pcie_data *)of_id->data;
rk_phy->reg_base = grf;

- rk_phy->phy_rst = devm_reset_control_get(dev, "phy");
+ rk_phy->phy_rst = devm_reset_control_get_exclusive(dev, "phy");
if (IS_ERR(rk_phy->phy_rst)) {
if (PTR_ERR(rk_phy->phy_rst) != -EPROBE_DEFER)
dev_err(dev,
--
2.11.0

2017-07-22 13:09:46

by Shawn Lin

Subject: Re: [PATCH 058/102] phy: rockchip-pcie: explicitly request exclusive reset control

Hi Philipp

On 2017/7/19 23:26, Philipp Zabel wrote:
> Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting
> reset lines") started to transition the reset control request API calls
> to explicitly state whether the driver needs exclusive or shared reset
> control behavior. Convert all drivers requesting exclusive resets to the
> explicit API call so the temporary transition helpers can be removed.
>
> No functional changes.
>
> Cc: Kishon Vijay Abraham I <[email protected]>
> Cc: Heiko Stuebner <[email protected]>
> Cc: [email protected]
> Signed-off-by: Philipp Zabel <[email protected]>
> ---
> drivers/phy/rockchip/phy-rockchip-pcie.c | 2 +-

This driver is under reconstruction and would probably go via
pci tree later. So I would mention your change to the reconstruction
work if that's applied.

> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
> index 6904633cad687..258220b7f481c 100644
> --- a/drivers/phy/rockchip/phy-rockchip-pcie.c
> +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
> @@ -305,7 +305,7 @@ static int rockchip_pcie_phy_probe(struct platform_device *pdev)
> rk_phy->phy_data = (struct rockchip_pcie_data *)of_id->data;
> rk_phy->reg_base = grf;
>
> - rk_phy->phy_rst = devm_reset_control_get(dev, "phy");
> + rk_phy->phy_rst = devm_reset_control_get_exclusive(dev, "phy");
> if (IS_ERR(rk_phy->phy_rst)) {
> if (PTR_ERR(rk_phy->phy_rst) != -EPROBE_DEFER)
> dev_err(dev,
>


--
Best Regards
Shawn Lin

2017-08-03 00:37:23

by Shawn Lin

Subject: Re: [PATCH 058/102] phy: rockchip-pcie: explicitly request exclusive reset control

[+ Bjorn]

On 2017/7/19 23:26, Philipp Zabel wrote:
> Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting
> reset lines") started to transition the reset control request API calls
> to explicitly state whether the driver needs exclusive or shared reset
> control behavior. Convert all drivers requesting exclusive resets to the
> explicit API call so the temporary transition helpers can be removed.
>
> No functional changes.
>
> Cc: Kishon Vijay Abraham I <[email protected]>
> Cc: Heiko Stuebner <[email protected]>
> Cc: [email protected]
> Signed-off-by: Philipp Zabel <[email protected]>

some changes for phy-rockchip-pcie.c would go via pci tree
for 4.14, so is it ok for Bjorn to pick this up if no objection
from Kishon, in case of merge conflict?

Anyway,

Reviewed-by: Shawn Lin <[email protected]>

> ---
> drivers/phy/rockchip/phy-rockchip-pcie.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy-rockchip-pcie.c
> index 6904633cad687..258220b7f481c 100644
> --- a/drivers/phy/rockchip/phy-rockchip-pcie.c
> +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
> @@ -305,7 +305,7 @@ static int rockchip_pcie_phy_probe(struct platform_device *pdev)
> rk_phy->phy_data = (struct rockchip_pcie_data *)of_id->data;
> rk_phy->reg_base = grf;
>
> - rk_phy->phy_rst = devm_reset_control_get(dev, "phy");
> + rk_phy->phy_rst = devm_reset_control_get_exclusive(dev, "phy");
> if (IS_ERR(rk_phy->phy_rst)) {
> if (PTR_ERR(rk_phy->phy_rst) != -EPROBE_DEFER)
> dev_err(dev,
>