ARM: dts: samsung: exynos4: fix camera unit addresses/ranges

[ Upstream commit ba2a45a48503665f7e8eeec51f8b40456566b0cd ]

The camera node has both unit address and children within the same bus
mapping, thus needs proper ranges property to fix dtc W=1 warnings:

  Warning (unit_address_vs_reg): /soc/camera@11800000: node has a unit name, but no reg or ranges property
  Warning (simple_bus_reg): /soc/camera@11800000: missing or empty reg/ranges property

Subtract 0x11800000 from all its children nodes.  No functional impact
expected.

Link: https://lore.kernel.org/r/20230722121719.150094-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/samsung/exynos4.dtsi b/arch/arm/boot/dts/samsung/exynos4.dtsi
index f775b93..7f981b5 100644 (file)
--- a/arch/arm/boot/dts/samsung/exynos4.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos4.dtsi
@@ -203,16 +203,16 @@
 
                camera: camera@11800000 {
                        compatible = "samsung,fimc";
+                       ranges = <0x0 0x11800000 0xa0000>;
                        status = "disabled";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        #clock-cells = <1>;
                        clock-output-names = "cam_a_clkout", "cam_b_clkout";
-                       ranges;
 
-                       fimc_0: fimc@11800000 {
+                       fimc_0: fimc@0 {
                                compatible = "samsung,exynos4210-fimc";
-                               reg = <0x11800000 0x1000>;
+                               reg = <0x0 0x1000>;
                                interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clock CLK_FIMC0>,
                                         <&clock CLK_SCLK_FIMC0>;
@@ -223,9 +223,9 @@
                                status = "disabled";
                        };
 
-                       fimc_1: fimc@11810000 {
+                       fimc_1: fimc@10000 {
                                compatible = "samsung,exynos4210-fimc";
-                               reg = <0x11810000 0x1000>;
+                               reg = <0x00010000 0x1000>;
                                interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clock CLK_FIMC1>,
                                         <&clock CLK_SCLK_FIMC1>;
@@ -236,9 +236,9 @@
                                status = "disabled";
                        };
 
-                       fimc_2: fimc@11820000 {
+                       fimc_2: fimc@20000 {
                                compatible = "samsung,exynos4210-fimc";
-                               reg = <0x11820000 0x1000>;
+                               reg = <0x00020000 0x1000>;
                                interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clock CLK_FIMC2>,
                                         <&clock CLK_SCLK_FIMC2>;
@@ -249,9 +249,9 @@
                                status = "disabled";
                        };
 
-                       fimc_3: fimc@11830000 {
+                       fimc_3: fimc@30000 {
                                compatible = "samsung,exynos4210-fimc";
-                               reg = <0x11830000 0x1000>;
+                               reg = <0x00030000 0x1000>;
                                interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clock CLK_FIMC3>,
                                         <&clock CLK_SCLK_FIMC3>;
@@ -262,9 +262,9 @@
                                status = "disabled";
                        };
 
-                       csis_0: csis@11880000 {
+                       csis_0: csis@80000 {
                                compatible = "samsung,exynos4210-csis";
-                               reg = <0x11880000 0x4000>;
+                               reg = <0x00080000 0x4000>;
                                interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clock CLK_CSIS0>,
                                         <&clock CLK_SCLK_CSIS0>;
@@ -278,9 +278,9 @@
                                #size-cells = <0>;
                        };
 
-                       csis_1: csis@11890000 {
+                       csis_1: csis@90000 {
                                compatible = "samsung,exynos4210-csis";
-                               reg = <0x11890000 0x4000>;
+                               reg = <0x00090000 0x4000>;
                                interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clock CLK_CSIS1>,
                                         <&clock CLK_SCLK_CSIS1>;

diff --git a/arch/arm/boot/dts/samsung/exynos4x12.dtsi b/arch/arm/boot/dts/samsung/exynos4x12.dtsi
index 84c1db2..83d9d0a 100644 (file)
--- a/arch/arm/boot/dts/samsung/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos4x12.dtsi
@@ -451,14 +451,15 @@
 };
 
 &camera {
+       ranges = <0x0 0x11800000 0xba1000>;
        clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>,
                 <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>;
        clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";
 
        /* fimc_[0-3] are configured outside, under phandles */
-       fimc_lite_0: fimc-lite@12390000 {
+       fimc_lite_0: fimc-lite@b90000 {
                compatible = "samsung,exynos4212-fimc-lite";
-               reg = <0x12390000 0x1000>;
+               reg = <0x00b90000 0x1000>;
                interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
                power-domains = <&pd_isp>;
                clocks = <&isp_clock CLK_ISP_FIMC_LITE0>;
@@ -467,9 +468,9 @@
                status = "disabled";
        };
 
-       fimc_lite_1: fimc-lite@123a0000 {
+       fimc_lite_1: fimc-lite@ba0000 {
                compatible = "samsung,exynos4212-fimc-lite";
-               reg = <0x123a0000 0x1000>;
+               reg = <0x00ba0000 0x1000>;
                interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
                power-domains = <&pd_isp>;
                clocks = <&isp_clock CLK_ISP_FIMC_LITE1>;
@@ -478,9 +479,9 @@
                status = "disabled";
        };
 
-       fimc_is: fimc-is@12000000 {
+       fimc_is: fimc-is@800000 {
                compatible = "samsung,exynos4212-fimc-is";
-               reg = <0x12000000 0x260000>;
+               reg = <0x00800000 0x260000>;
                interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
                power-domains = <&pd_isp>;
@@ -525,9 +526,9 @@
                        reg = <0x10020000 0x3000>;
                };
 
-               i2c1_isp: i2c-isp@12140000 {
+               i2c1_isp: i2c-isp@940000 {
                        compatible = "samsung,exynos4212-i2c-isp";
-                       reg = <0x12140000 0x100>;
+                       reg = <0x00940000 0x100>;
                        clocks = <&isp_clock CLK_ISP_I2C1_ISP>;
                        clock-names = "i2c_isp";
                        #address-cells = <1>;