From: George Moussalem <redacted>
Switch to using bulk reset_control functions to prepare the driver for
managing multiple resets, acquiring reset controls by name, and
uniformly storing resets in the private data structure to enable support
for future combo PHY functionality requiring multiple resets.
Tested-by: Stanislaw Pal <redacted>
Reviewed-by: Manivannan Sadhasivam <redacted>
Signed-off-by: George Moussalem <redacted>
---
.../phy/qualcomm/phy-qcom-uniphy-pcie-usb3-28lp.c | 31 ++++++++++++++++------
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-uniphy-pcie-usb3-28lp.c b/drivers/phy/qualcomm/phy-qcom-uniphy-pcie-usb3-28lp.c
index c12de5549652..0a50eb44c0ce 100644
--- a/drivers/phy/qualcomm/phy-qcom-uniphy-pcie-usb3-28lp.c
+++ b/drivers/phy/qualcomm/phy-qcom-uniphy-pcie-usb3-28lp.c
@@ -67,7 +67,8 @@ struct qcom_uniphy {
const struct qcom_uniphy_data *data;
struct clk_bulk_data *clks;
int num_clks;
- struct reset_control *resets;
+ struct reset_control_bulk_data *resets;
+ int num_resets;
void __iomem *base;
int lanes;
};@@ -136,7 +137,7 @@ static int qcom_uniphy_pcie_power_off(struct phy *x)
clk_bulk_disable_unprepare(phy->num_clks, phy->clks);
- return reset_control_assert(phy->resets);
+ return reset_control_bulk_assert(phy->num_resets, phy->resets);
}
static int qcom_uniphy_pcie_power_on(struct phy *x)
@@ -144,7 +145,7 @@ static int qcom_uniphy_pcie_power_on(struct phy *x)
struct qcom_uniphy *phy = phy_get_drvdata(x);
int ret;
- ret = reset_control_assert(phy->resets);
+ ret = reset_control_bulk_assert(phy->num_resets, phy->resets);
if (ret) {
dev_err(phy->dev, "reset assert failed (%d)\n", ret);
return ret;@@ -152,7 +153,7 @@ static int qcom_uniphy_pcie_power_on(struct phy *x)
usleep_range(RST_ASSERT_DELAY_MIN_US, RST_ASSERT_DELAY_MAX_US);
- ret = reset_control_deassert(phy->resets);
+ ret = reset_control_bulk_deassert(phy->num_resets, phy->resets);
if (ret) {
dev_err(phy->dev, "reset deassert failed (%d)\n", ret);
return ret;@@ -176,19 +177,33 @@ static int qcom_uniphy_pcie_power_on(struct phy *x)
static inline int qcom_uniphy_pcie_usb3_get_resources(struct platform_device *pdev,
struct qcom_uniphy *phy)
{
+ struct device *dev = phy->dev;
struct resource *res;
+ int i, count, ret;
phy->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(phy->base))
return PTR_ERR(phy->base);
- phy->num_clks = devm_clk_bulk_get_all(phy->dev, &phy->clks);
+ phy->num_clks = devm_clk_bulk_get_all(dev, &phy->clks);
if (phy->num_clks < 0)
return phy->num_clks;
- phy->resets = devm_reset_control_array_get_exclusive(phy->dev);
- if (IS_ERR(phy->resets))
- return PTR_ERR(phy->resets);
+ count = of_count_phandle_with_args(dev->of_node, "resets", "#reset-cells");
+ if (count < 0)
+ return count;
+
+ phy->resets = devm_kcalloc(dev, count, sizeof(*phy->resets), GFP_KERNEL);
+ if (!phy->resets)
+ return -ENOMEM;
+
+ for (i = 0; i < count; i++) {
+ phy->resets[i].rstc = devm_reset_control_get_exclusive_by_index(dev, i);
+ if (IS_ERR(phy->resets[i].rstc))
+ return PTR_ERR(phy->resets[i].rstc);
+ }
+
+ phy->num_resets = count;
return 0;
}
--
2.53.0