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

Commit bc19b9a8 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Rafael J. Wysocki
Browse files

PM / AVS: rockchip-io: make io-domains a child of the GRF 



IO-domain handling is part of the general register files, so should live
under the grf directly. This change allows the grf to be a simple-mfd and
the io-domains fetching the syscon regmap from that parent-node.

The old binding is of course preserved, though deprecated.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Acked-by: default avatarKevin Hilman <khilman@baylibre.com>
Tested-by: default avatarDavid Wu <david.wu@rock-chips.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 02da2d72

Documentation/devicetree/bindings/power/rockchip-io-domain.txt

+3 −1
Original line number Diff line number Diff line
@@ -37,8 +37,10 @@ Required properties: 
  - "rockchip,rk3368-pmu-io-voltage-domain" for rk3368 pmu-domains

  - "rockchip,rk3399-io-voltage-domain" for rk3399

  - "rockchip,rk3399-pmu-io-voltage-domain" for rk3399 pmu-domains

- rockchip,grf: phandle to the syscon managing the "general register files"



Deprecated properties:

- rockchip,grf: phandle to the syscon managing the "general register files"

    Systems should move the io-domains to a sub-node of the grf simple-mfd.



You specify supplies using the standard regulator bindings by including

a phandle the relevant regulator.  All specified supplies must be able

drivers/power/avs/rockchip-io-domain.c

+9 −1
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ static int rockchip_iodomain_probe(struct platform_device *pdev) 
	struct device_node *np = pdev->dev.of_node;

	const struct of_device_id *match;

	struct rockchip_iodomain *iod;

	struct device *parent;

	int i, ret = 0;



	if (!np)
@@ -351,7 +352,14 @@ static int rockchip_iodomain_probe(struct platform_device *pdev) 
	match = of_match_node(rockchip_iodomain_match, np);

	iod->soc_data = (struct rockchip_iodomain_soc_data *)match->data;



	parent = pdev->dev.parent;

	if (parent && parent->of_node) {

		iod->grf = syscon_node_to_regmap(parent->of_node);

	} else {

		dev_dbg(&pdev->dev, "falling back to old binding\n");

		iod->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");

	}



	if (IS_ERR(iod->grf)) {

		dev_err(&pdev->dev, "couldn't find grf regmap\n");

		return PTR_ERR(iod->grf);