Merge tag 'imx-fixes-4.16' of... (36b38aef) · Commits · 戴 / test

Merge tag 'imx-fixes-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes Pull "i.MX fixes for 4.16" from Shawn Guo: - Fix i.MX GPC driver to remove power domains only when they are initialized in imx_gpc_probe(). - Fix the broken Engicam i.CoreM6 DualLite/Solo RQS board DT to include imx6dl.dtsi instead of imx6q.dtsi. * tag 'imx-fixes-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx6dl: Include correct dtsi file for Engicam i.CoreM6 DualLite/Solo RQS soc: imx: gpc: de-register power domains only if initialized

arch/arm/boot/dts/imx6dl-icore-rqs.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@

		/dts-v1/;

		#include "imx6q.dtsi"
		#include "imx6dl.dtsi"
		#include "imx6qdl-icore-rqs.dtsi"

		/ {

drivers/soc/imx/gpc.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -470,13 +470,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);

Admin message