Commit e1bb3673 authored Jan 07, 2018 by Stefan Agner Committed by Greg Kroah-Hartman May 30, 2018

soc: imx: gpc: de-register power domains only if initialized



[ Upstream commit 7801c545e706674aeed40256eb806ad37b18ad71 ]

If power domain information are missing in the device tree, no
power domains get initialized. However, imx_gpc_remove tries to
remove power domains always in the old DT binding case. Only
remove power domains when imx_gpc_probe initialized them in
first place.

Fixes: 721cabf6 ("soc: imx: move PGC handling to a new GPC driver")
Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e65cd9a2

drivers/soc/imx/gpc.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -456,13 +456,21 @@ static int imx_gpc_probe(struct platform_device *pdev)

		static int imx_gpc_remove(struct platform_device *pdev)
		{
		struct device_node *pgc_node;
		int ret;

		pgc_node = of_get_child_by_name(pdev->dev.of_node, "pgc");

		/* bail out if DT too old and doesn't provide the necessary info */
		if (!of_property_read_bool(pdev->dev.of_node, "#power-domain-cells") &&
		!pgc_node)
		return 0;

		/*
		* If the old DT binding is used the toplevel driver needs to
		* de-register the power domains
		*/
		if (!of_get_child_by_name(pdev->dev.of_node, "pgc")) {
		if (!pgc_node) {
		of_genpd_del_provider(pdev->dev.of_node);

		ret = pm_genpd_remove(&imx_gpc_domains[GPC_PGC_DOMAIN_PU].base);