Merge tag 'imx-drivers-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/drivers

i.MX drivers update for 4.18:
 - Use platform_device_add_data() instead of a pointer to a static
   memory in gpc/gpcv2 driver for platform data passing, so that we
   can avoid a BUG() when calling platform_device_put().

* tag 'imx-drivers-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  soc: imx: gpc: Do not pass static memory as platform data
  soc: imx: gpcv2: Do not pass static memory as platform data

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 28 insertions, 12 deletions

diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c
index c4d35f32af8d..32f0748fd067 100644
--- a/drivers/soc/imx/gpc.c
+++ b/drivers/soc/imx/gpc.c
@@ -443,17 +443,25 @@ static int imx_gpc_probe(struct platform_device *pdev)
                         if (domain_index >= of_id_data->num_domains)
                                 continue;
 
-                        domain = &imx_gpc_domains[domain_index];
-                        domain->regmap = regmap;
-                        domain->ipg_rate_mhz = ipg_rate_mhz;
-
                         pd_pdev = platform_device_alloc("imx-pgc-power-domain",
                                                         domain_index);
                         if (!pd_pdev) {
                                 of_node_put(np);
                                 return -ENOMEM;
                         }
-                        pd_pdev->dev.platform_data = domain;
+
+                        ret = platform_device_add_data(pd_pdev,
+                                                       &imx_gpc_domains[domain_index],
+                                                       sizeof(imx_gpc_domains[domain_index]));
+                        if (ret) {
+                                platform_device_put(pd_pdev);
+                                of_node_put(np);
+                                return ret;
+                        }
+                        domain = pd_pdev->dev.platform_data;
+                        domain->regmap = regmap;
+                        domain->ipg_rate_mhz = ipg_rate_mhz;
+
                         pd_pdev->dev.parent = &pdev->dev;
                         pd_pdev->dev.of_node = np;
 
diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c
index afc7ecc3c187..f4e3bd40c72e 100644
--- a/drivers/soc/imx/gpcv2.c
+++ b/drivers/soc/imx/gpcv2.c
@@ -155,7 +155,7 @@ static int imx7_gpc_pu_pgc_sw_pdn_req(struct generic_pm_domain *genpd)
         return imx7_gpc_pu_pgc_sw_pxx_req(genpd, false);
 }
 
-static struct imx7_pgc_domain imx7_pgc_domains[] = {
+static const struct imx7_pgc_domain imx7_pgc_domains[] = {
         [IMX7_POWER_DOMAIN_MIPI_PHY] = {
                 .genpd = {
                         .name      = "mipi-phy",
@@ -321,11 +321,6 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
                         continue;
                 }
 
-                domain = &imx7_pgc_domains[domain_index];
-                domain->regmap = regmap;
-                domain->genpd.power_on  = imx7_gpc_pu_pgc_sw_pup_req;
-                domain->genpd.power_off = imx7_gpc_pu_pgc_sw_pdn_req;
-
                 pd_pdev = platform_device_alloc("imx7-pgc-domain",
                                                 domain_index);
                 if (!pd_pdev) {
@@ -334,7 +329,20 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
                         return -ENOMEM;
                 }
 
-                pd_pdev->dev.platform_data = domain;
+                ret = platform_device_add_data(pd_pdev,
+                                               &imx7_pgc_domains[domain_index],
+                                               sizeof(imx7_pgc_domains[domain_index]));
+                if (ret) {
+                        platform_device_put(pd_pdev);
+                        of_node_put(np);
+                        return ret;
+                }
+
+                domain = pd_pdev->dev.platform_data;
+                domain->regmap = regmap;
+                domain->genpd.power_on  = imx7_gpc_pu_pgc_sw_pup_req;
+                domain->genpd.power_off = imx7_gpc_pu_pgc_sw_pdn_req;
+
                 pd_pdev->dev.parent = dev;
                 pd_pdev->dev.of_node = np;