Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97dd9101 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kishon Vijay Abraham I
Browse files

phy: rockchip-usb: move per-phy init into a separate function 



This unclutters the loop in probe a lot and makes current (and future)
error handling easier to read.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 5fdbb97d

drivers/phy/phy-rockchip-usb.c

+43 −40
Original line number Diff line number Diff line
@@ -103,47 +103,28 @@ static void rockchip_usb_phy_action(void *data) 
		clk_put(rk_phy->clk);

}



static int rockchip_usb_phy_probe(struct platform_device *pdev)

static int rockchip_usb_phy_init(struct rockchip_usb_phy_base *base,

				 struct device_node *child)

{

	struct device *dev = &pdev->dev;

	struct rockchip_usb_phy_base *phy_base;

	struct rockchip_usb_phy *rk_phy;

	struct phy_provider *phy_provider;

	struct device_node *child;

	unsigned int reg_offset;

	int err;



	phy_base = devm_kzalloc(dev, sizeof(*phy_base), GFP_KERNEL);

	if (!phy_base)

	rk_phy = devm_kzalloc(base->dev, sizeof(*rk_phy), GFP_KERNEL);

	if (!rk_phy)

		return -ENOMEM;



	phy_base->dev = dev;

	phy_base->reg_base = syscon_regmap_lookup_by_phandle(dev->of_node,

							     "rockchip,grf");

	if (IS_ERR(phy_base->reg_base)) {

		dev_err(&pdev->dev, "Missing rockchip,grf property\n");

		return PTR_ERR(phy_base->reg_base);

	}



	for_each_available_child_of_node(dev->of_node, child) {

		rk_phy = devm_kzalloc(dev, sizeof(*rk_phy), GFP_KERNEL);

		if (!rk_phy) {

			err = -ENOMEM;

			goto put_child;

		}



		rk_phy->base = phy_base;

	rk_phy->base = base;



	if (of_property_read_u32(child, "reg", &reg_offset)) {

			dev_err(dev, "missing reg property in node %s\n",

		dev_err(base->dev, "missing reg property in node %s\n",

			child->name);

			err = -EINVAL;

			goto put_child;

		return -EINVAL;

	}



	rk_phy->reg_offset = reg_offset;



		err = devm_add_action(dev, rockchip_usb_phy_action, rk_phy);

	err = devm_add_action(base->dev, rockchip_usb_phy_action, rk_phy);

	if (err)

		return err;
@@ -151,26 +132,48 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev) 
	if (IS_ERR(rk_phy->clk))

		rk_phy->clk = NULL;



		rk_phy->phy = devm_phy_create(dev, child, &ops);

	rk_phy->phy = devm_phy_create(base->dev, child, &ops);

	if (IS_ERR(rk_phy->phy)) {

			dev_err(dev, "failed to create PHY\n");

			err = PTR_ERR(rk_phy->phy);

			goto put_child;

		dev_err(base->dev, "failed to create PHY\n");

		return PTR_ERR(rk_phy->phy);

	}

	phy_set_drvdata(rk_phy->phy, rk_phy);



	/* only power up usb phy when it use, so disable it when init*/

		err = rockchip_usb_phy_power(rk_phy, 1);

		if (err)

			goto put_child;

	return rockchip_usb_phy_power(rk_phy, 1);

}



	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);

	return PTR_ERR_OR_ZERO(phy_provider);

put_child:

static int rockchip_usb_phy_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct rockchip_usb_phy_base *phy_base;

	struct phy_provider *phy_provider;

	struct device_node *child;

	int err;



	phy_base = devm_kzalloc(dev, sizeof(*phy_base), GFP_KERNEL);

	if (!phy_base)

		return -ENOMEM;



	phy_base->dev = dev;

	phy_base->reg_base = syscon_regmap_lookup_by_phandle(dev->of_node,

							     "rockchip,grf");

	if (IS_ERR(phy_base->reg_base)) {

		dev_err(&pdev->dev, "Missing rockchip,grf property\n");

		return PTR_ERR(phy_base->reg_base);

	}



	for_each_available_child_of_node(dev->of_node, child) {

		err = rockchip_usb_phy_init(phy_base, child);

		if (err) {

			of_node_put(child);

			return err;

		}

	}



	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);

	return PTR_ERR_OR_ZERO(phy_provider);

}



static const struct of_device_id rockchip_usb_phy_dt_ids[] = {

	{ .compatible = "rockchip,rk3288-usb-phy" },