media: exynos4-is: fimc-is: replace duplicate pmu node with phandle

Devicetree for the FIMC IS camera included duplicated PMU node as its
child like:

  soc@0 {
    system-controller@10020000 { ... }; // Real PMU

    camera@11800000 {
      fimc-is@12000000 {
        // FIMC IS camera node
        pmu@10020000 {
          reg = <0x10020000 0x3000>; // Fake PMU node
        };
      };
    };
  };

This is not a correct representation of the hardware.  Mapping the PMU
(Power Management Unit) IO memory should be via syscon-like phandle
(samsung,pmu-syscon, already used for other drivers), not by duplicating
"pmu" Devicetree node inside the FIMC IS.  Backward compatibility is
preserved.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-is.c b/drivers/media/platform/samsung/exynos4-is/fimc-is.c
index 530a148fe4d3825312af1f4b1e45ef3d61e8b490..a08c87ef6e2d87c8f2adb59442d3f4d68df34403 100644 (file)
--- a/drivers/media/platform/samsung/exynos4-is/fimc-is.c
+++ b/drivers/media/platform/samsung/exynos4-is/fimc-is.c
@@ -767,12 +767,32 @@ static void fimc_is_debugfs_create(struct fimc_is *is)
 static int fimc_is_runtime_resume(struct device *dev);
 static int fimc_is_runtime_suspend(struct device *dev);
 
+static void __iomem *fimc_is_get_pmu_regs(struct device *dev)
+{
+       struct device_node *node;
+       void __iomem *regs;
+
+       node = of_parse_phandle(dev->of_node, "samsung,pmu-syscon", 0);
+       if (!node) {
+               node = of_get_child_by_name(dev->of_node, "pmu");
+               if (!node)
+                       return IOMEM_ERR_PTR(-ENODEV);
+               dev_warn(dev, "Found PMU node via deprecated method, update your DTB\n");
+       }
+
+       regs = of_iomap(node, 0);
+       of_node_put(node);
+       if (!regs)
+               return IOMEM_ERR_PTR(-ENOMEM);
+
+       return regs;
+}
+
 static int fimc_is_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct fimc_is *is;
        struct resource res;
-       struct device_node *node;
        int ret;
 
        is = devm_kzalloc(&pdev->dev, sizeof(*is), GFP_KERNEL);
@@ -794,14 +814,9 @@ static int fimc_is_probe(struct platform_device *pdev)
        if (IS_ERR(is->regs))
                return PTR_ERR(is->regs);
 
-       node = of_get_child_by_name(dev->of_node, "pmu");
-       if (!node)
-               return -ENODEV;
-
-       is->pmu_regs = of_iomap(node, 0);
-       of_node_put(node);
-       if (!is->pmu_regs)
-               return -ENOMEM;
+       is->pmu_regs = fimc_is_get_pmu_regs(dev);
+       if (IS_ERR(is->pmu_regs))
+               return PTR_ERR(is->pmu_regs);
 
        is->irq = irq_of_parse_and_map(dev->of_node, 0);
        if (!is->irq) {