diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-02-28 23:24:01 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-02-28 23:24:01 +0100 |
| commit | 36b38aef5749583e8695b2b93636391a47cf24c7 (patch) | |
| tree | d8783f7bf5638f570ad2fdb7cb9d3efc9770bdae | |
| parent | 29d1d52b06fbf4b26b592310bff7c4fe3ffaca07 (diff) | |
| parent | c0c6bb2322964bd264b4ddedaa5776f40c709f0c (diff) | |
| download | linux-36b38aef5749583e8695b2b93636391a47cf24c7.tar.gz | |
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
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-icore-rqs.dts | 2 | ||||
| -rw-r--r-- | drivers/soc/imx/gpc.c | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6dl-icore-rqs.dts b/arch/arm/boot/dts/imx6dl-icore-rqs.dts index cf42c2f5cdc7f9..1281bc39b7ab87 100644 --- a/arch/arm/boot/dts/imx6dl-icore-rqs.dts +++ b/arch/arm/boot/dts/imx6dl-icore-rqs.dts @@ -42,7 +42,7 @@ /dts-v1/; -#include "imx6q.dtsi" +#include "imx6dl.dtsi" #include "imx6qdl-icore-rqs.dtsi" / { diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c index 53f7275d6cbdb5..62bb724726d9ff 100644 --- a/drivers/soc/imx/gpc.c +++ b/drivers/soc/imx/gpc.c @@ -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); |