| Message ID | 20230722115441.139628-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [1/3] media: dt-bindings: samsung,exynos4212-fimc-is: replace duplicate pmu node with phandle | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success | |
| robh/patch-applied | success | |
| robh/dtbs-check | warning | build log |
| robh/dt-meta-schema | success |
On Sat, 22 Jul 2023 13:54:39 +0200, Krzysztof Kozlowski wrote: > The FIMC IS camera must access the PMU (Power Management Unit) IO memory > to control camera power. This was achieved by duplicating the 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. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > .../media/samsung,exynos4212-fimc-is.yaml | 15 ++++++++++----- > .../devicetree/bindings/media/samsung,fimc.yaml | 5 +---- > 2 files changed, 11 insertions(+), 9 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org>
Hi Krzysztof, On 22/07/2023 13:54, Krzysztof Kozlowski wrote: > 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> > --- > .../platform/samsung/exynos4-is/fimc-is.c | 33 ++++++++++++++----- > 1 file changed, 24 insertions(+), 9 deletions(-) > > diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-is.c b/drivers/media/platform/samsung/exynos4-is/fimc-is.c > index 530a148fe4d3..c4c191771093 100644 > --- 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) { > + dev_warn(dev, "Finding PMU node via deprecated method, update your DTB\n"); > + node = of_get_child_by_name(dev->of_node, "pmu"); > + if (!node) > + return ERR_PTR(-ENODEV); > + } > + > + regs = of_iomap(node, 0); > + of_node_put(node); > + if (!regs) > + return ERR_PTR(-ENOMEM); sparse gives me these warnings for these ERR_PTR returns: drivers/media/platform/samsung/exynos4-is/fimc-is.c:780:39: warning: incorrect type in return expression (different address spaces) drivers/media/platform/samsung/exynos4-is/fimc-is.c:780:39: expected void [noderef] __iomem * drivers/media/platform/samsung/exynos4-is/fimc-is.c:780:39: got void * drivers/media/platform/samsung/exynos4-is/fimc-is.c:786:31: warning: incorrect type in return expression (different address spaces) drivers/media/platform/samsung/exynos4-is/fimc-is.c:786:31: expected void [noderef] __iomem * drivers/media/platform/samsung/exynos4-is/fimc-is.c:786:31: got void * Regards, Hans > + > + 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) {
On 07/08/2023 15:06, Hans Verkuil wrote: > Hi Krzysztof, > > On 22/07/2023 13:54, Krzysztof Kozlowski wrote: >> 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> >> --- >> .../platform/samsung/exynos4-is/fimc-is.c | 33 ++++++++++++++----- >> 1 file changed, 24 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-is.c b/drivers/media/platform/samsung/exynos4-is/fimc-is.c >> index 530a148fe4d3..c4c191771093 100644 >> --- 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) { >> + dev_warn(dev, "Finding PMU node via deprecated method, update your DTB\n"); >> + node = of_get_child_by_name(dev->of_node, "pmu"); >> + if (!node) >> + return ERR_PTR(-ENODEV); >> + } >> + >> + regs = of_iomap(node, 0); >> + of_node_put(node); >> + if (!regs) >> + return ERR_PTR(-ENOMEM); > > sparse gives me these warnings for these ERR_PTR returns: > > drivers/media/platform/samsung/exynos4-is/fimc-is.c:780:39: warning: incorrect type in return expression (different address spaces) > drivers/media/platform/samsung/exynos4-is/fimc-is.c:780:39: expected void [noderef] __iomem * > drivers/media/platform/samsung/exynos4-is/fimc-is.c:780:39: got void * Thanks, indeed. I will use IOMEM_ERR_PTR() Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml b/Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml index 3691cd4962b2..3a5ff3f47060 100644 --- a/Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml +++ b/Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml @@ -75,13 +75,20 @@ properties: power-domains: maxItems: 1 + samsung,pmu-syscon: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Power Management Unit (PMU) system controller interface, used to + power/start the ISP. + patternProperties: "^pmu@[0-9a-f]+$": type: object additionalProperties: false + deprecated: true description: Node representing the SoC's Power Management Unit (duplicated with the - correct PMU node in the SoC). + correct PMU node in the SoC). Deprecated, use samsung,pmu-syscon. properties: reg: @@ -131,6 +138,7 @@ required: - clock-names - interrupts - ranges + - samsung,pmu-syscon - '#size-cells' additionalProperties: false @@ -179,15 +187,12 @@ examples: <&sysmmu_fimc_fd>, <&sysmmu_fimc_mcuctl>; iommu-names = "isp", "drc", "fd", "mcuctl"; power-domains = <&pd_isp>; + samsung,pmu-syscon = <&pmu_system_controller>; #address-cells = <1>; #size-cells = <1>; ranges; - pmu@10020000 { - reg = <0x10020000 0x3000>; - }; - i2c-isp@12140000 { compatible = "samsung,exynos4212-i2c-isp"; reg = <0x12140000 0x100>; diff --git a/Documentation/devicetree/bindings/media/samsung,fimc.yaml b/Documentation/devicetree/bindings/media/samsung,fimc.yaml index 79ff6d83a9fd..530a08f5d3fe 100644 --- a/Documentation/devicetree/bindings/media/samsung,fimc.yaml +++ b/Documentation/devicetree/bindings/media/samsung,fimc.yaml @@ -236,15 +236,12 @@ examples: <&sysmmu_fimc_fd>, <&sysmmu_fimc_mcuctl>; iommu-names = "isp", "drc", "fd", "mcuctl"; power-domains = <&pd_isp>; + samsung,pmu-syscon = <&pmu_system_controller>; #address-cells = <1>; #size-cells = <1>; ranges; - pmu@10020000 { - reg = <0x10020000 0x3000>; - }; - i2c-isp@12140000 { compatible = "samsung,exynos4212-i2c-isp"; reg = <0x12140000 0x100>;
The FIMC IS camera must access the PMU (Power Management Unit) IO memory to control camera power. This was achieved by duplicating the 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. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- .../media/samsung,exynos4212-fimc-is.yaml | 15 ++++++++++----- .../devicetree/bindings/media/samsung,fimc.yaml | 5 +---- 2 files changed, 11 insertions(+), 9 deletions(-)