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

Commit 0311c76e authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kishon Vijay Abraham I
Browse files

phy: rockchip-dp: should be a child device of the GRF 



The displayport-phy is fully enclosed in the general register files (GRF).
Therefore as seen from the device-tree it shouldn't be a separate platform-
device but instead a sub-device of the GRF - using the simply-mfd mechanism.

The driver entered the kernel in the current merge-window, so we can still
adapt the binding without needing a fallback, as the binding hasn't been
released with a full kernel yet.

While the edp phy is fully part of the GRF, it doesn't have any separate
register set there, so doesn't get any register-area assigned.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Acked-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarYakir Yang <ykk@rock-chips.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent f55532a0

Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt

+11 −7
Original line number Diff line number Diff line
@@ -8,15 +8,19 @@ Required properties: 
	of memory mapped region.

- clock-names: from common clock binding:

	Required elements: "24m"

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

- #phy-cells : from the generic PHY bindings, must be 0;



Example:



grf: syscon@ff770000 {

	compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";



...



	edp_phy: edp-phy {

		compatible = "rockchip,rk3288-dp-phy";

	rockchip,grf = <&grf>;

		clocks = <&cru SCLK_EDP_24M>;

		clock-names = "24m";

		#phy-cells = <0>;

	};

};

drivers/phy/phy-rockchip-dp.c

+5 −2
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ static int rockchip_dp_phy_probe(struct platform_device *pdev) 
	if (!np)

		return -ENODEV;



	if (!dev->parent || !dev->parent->of_node)

		return -ENODEV;



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

	if (IS_ERR(dp))

		return -ENOMEM;
@@ -104,9 +107,9 @@ static int rockchip_dp_phy_probe(struct platform_device *pdev) 
		return ret;

	}



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

	dp->grf = syscon_node_to_regmap(dev->parent->of_node);

	if (IS_ERR(dp->grf)) {

		dev_err(dev, "rk3288-dp needs rockchip,grf property\n");

		dev_err(dev, "rk3288-dp needs the General Register Files syscon\n");

		return PTR_ERR(dp->grf);

	}