ARM: dts: exynos: move MIPI phy to PMU node in Exynos4

The MIPI phy is actually part of the Power Management Unit system
controller.  It does not have its own address space, thus keeping the
node under soc causes warnings:

  xynos4412-i9305.dtb: soc: video-phy: {'compatible': ['samsung,s5pv210-mipi-video-phy'],
    '#phy-cells': [[1]], 'syscon': [[11]], 'phandle': [[13]]} should not be valid under {'type': 'object'}

Link: https://lore.kernel.org/r/20230207192851.549242-3-krzysztof.kozlowski@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 44dcb1377475a2f168d81801e19d99a3bd40b7ad..8dd6976ab0a71ce87c18b35d7c8eb02a7653e06f 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -105,12 +105,6 @@
                        reg = <0x12570000 0x14>;
                };
 
-               mipi_phy: video-phy {
-                       compatible = "samsung,s5pv210-mipi-video-phy";
-                       #phy-cells = <1>;
-                       syscon = <&pmu_system_controller>;
-               };
-
                pd_mfc: power-domain@10023c40 {
                        compatible = "samsung,exynos4210-pd";
                        reg = <0x10023c40 0x20>;
@@ -181,11 +175,16 @@
                };
 
                pmu_system_controller: system-controller@10020000 {
-                       compatible = "samsung,exynos4210-pmu", "syscon";
+                       compatible = "samsung,exynos4210-pmu", "simple-mfd", "syscon";
                        reg = <0x10020000 0x4000>;
                        interrupt-controller;
                        #interrupt-cells = <3>;
                        interrupt-parent = <&gic>;
+
+                       mipi_phy: mipi-phy {
+                               compatible = "samsung,s5pv210-mipi-video-phy";
+                               #phy-cells = <1>;
+                       };
                };
 
                dsi_0: dsi@11c80000 {

diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index 11f9dd94b6b33fcf9da9b5c2c6bf2b4f821d1fb5..7fa3e5fd68017a79a859395f3df4f74b2d5ae46d 100644 (file)
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -798,7 +798,7 @@
 };
 
 &pmu_system_controller {
-       compatible = "samsung,exynos4412-pmu", "syscon";
+       compatible = "samsung,exynos4412-pmu", "simple-mfd", "syscon";
        clock-names = "clkout0", "clkout1", "clkout2", "clkout3",
                        "clkout4", "clkout8", "clkout9";
        clocks = <&clock CLK_OUT_DMC>, <&clock CLK_OUT_TOP>,