[PATCH 7/8] ARM: dts: exynos: move DP and MIPI phys to PMU node in Exynos5250

Krzysztof Kozlowski posted 8 patches 2 years, 7 months ago
[PATCH 7/8] ARM: dts: exynos: move DP and MIPI phys to PMU node in Exynos5250
Posted by Krzysztof Kozlowski 2 years, 7 months ago
The DisplayPort and MIPI phys are actually part of the Power Management
Unit system controller.  They do not have their own address space, thus
keeping the nodes under soc causes warnings:

  exynos5250-arndale.dtb: soc: video-phy-0: {'compatible': ['samsung,exynos5250-dp-video-phy'],
    'samsung,pmu-syscon': [[20]], '#phy-cells': [[0]], 'phandle': [[24]]} should not be valid under {'type': 'object'}

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm/boot/dts/exynos5250.dtsi | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 97e89859ba3d..a35c00f055a3 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -290,7 +290,7 @@ pinctrl_3: pinctrl@3860000 {
 		};
 
 		pmu_system_controller: system-controller@10040000 {
-			compatible = "samsung,exynos5250-pmu", "syscon";
+			compatible = "samsung,exynos5250-pmu", "simple-mfd", "syscon";
 			reg = <0x10040000 0x5000>;
 			clock-names = "clkout16";
 			clocks = <&clock CLK_FIN_PLL>;
@@ -298,6 +298,16 @@ pmu_system_controller: system-controller@10040000 {
 			interrupt-controller;
 			#interrupt-cells = <3>;
 			interrupt-parent = <&gic>;
+
+			dp_phy: dp-phy {
+				compatible = "samsung,exynos5250-dp-video-phy";
+				#phy-cells = <0>;
+			};
+
+			mipi_phy: mipi-phy {
+				compatible = "samsung,s5pv210-mipi-video-phy";
+				#phy-cells = <1>;
+			};
 		};
 
 		watchdog@101d0000 {
@@ -810,18 +820,6 @@ mixer: mixer@14450000 {
 			status = "disabled";
 		};
 
-		dp_phy: video-phy-0 {
-			compatible = "samsung,exynos5250-dp-video-phy";
-			samsung,pmu-syscon = <&pmu_system_controller>;
-			#phy-cells = <0>;
-		};
-
-		mipi_phy: video-phy-1 {
-			compatible = "samsung,s5pv210-mipi-video-phy";
-			#phy-cells = <1>;
-			syscon = <&pmu_system_controller>;
-		};
-
 		dsi_0: dsi@14500000 {
 			compatible = "samsung,exynos4210-mipi-dsi";
 			reg = <0x14500000 0x10000>;
-- 
2.34.1
Re: [PATCH 7/8] ARM: dts: exynos: move DP and MIPI phys to PMU node in Exynos5250
Posted by Marek Szyprowski 2 years, 7 months ago
On 27.01.2023 20:40, Krzysztof Kozlowski wrote:
> The DisplayPort and MIPI phys are actually part of the Power Management
> Unit system controller.  They do not have their own address space, thus
> keeping the nodes under soc causes warnings:
>
>    exynos5250-arndale.dtb: soc: video-phy-0: {'compatible': ['samsung,exynos5250-dp-video-phy'],
>      'samsung,pmu-syscon': [[20]], '#phy-cells': [[0]], 'phandle': [[24]]} should not be valid under {'type': 'object'}
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>   arch/arm/boot/dts/exynos5250.dtsi | 24 +++++++++++-------------
>   1 file changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
> index 97e89859ba3d..a35c00f055a3 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -290,7 +290,7 @@ pinctrl_3: pinctrl@3860000 {
>   		};
>   
>   		pmu_system_controller: system-controller@10040000 {
> -			compatible = "samsung,exynos5250-pmu", "syscon";
> +			compatible = "samsung,exynos5250-pmu", "simple-mfd", "syscon";
>   			reg = <0x10040000 0x5000>;
>   			clock-names = "clkout16";
>   			clocks = <&clock CLK_FIN_PLL>;
> @@ -298,6 +298,16 @@ pmu_system_controller: system-controller@10040000 {
>   			interrupt-controller;
>   			#interrupt-cells = <3>;
>   			interrupt-parent = <&gic>;
> +
> +			dp_phy: dp-phy {
> +				compatible = "samsung,exynos5250-dp-video-phy";
> +				#phy-cells = <0>;
> +			};
> +
> +			mipi_phy: mipi-phy {
> +				compatible = "samsung,s5pv210-mipi-video-phy";
> +				#phy-cells = <1>;
> +			};
>   		};
>   
>   		watchdog@101d0000 {
> @@ -810,18 +820,6 @@ mixer: mixer@14450000 {
>   			status = "disabled";
>   		};
>   
> -		dp_phy: video-phy-0 {
> -			compatible = "samsung,exynos5250-dp-video-phy";
> -			samsung,pmu-syscon = <&pmu_system_controller>;
> -			#phy-cells = <0>;
> -		};
> -
> -		mipi_phy: video-phy-1 {
> -			compatible = "samsung,s5pv210-mipi-video-phy";
> -			#phy-cells = <1>;
> -			syscon = <&pmu_system_controller>;
> -		};
> -
>   		dsi_0: dsi@14500000 {
>   			compatible = "samsung,exynos4210-mipi-dsi";
>   			reg = <0x14500000 0x10000>;

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland
Re: (subset) [PATCH 7/8] ARM: dts: exynos: move DP and MIPI phys to PMU node in Exynos5250
Posted by Krzysztof Kozlowski 2 years, 6 months ago
On Fri, 27 Jan 2023 20:40:56 +0100, Krzysztof Kozlowski wrote:
> The DisplayPort and MIPI phys are actually part of the Power Management
> Unit system controller.  They do not have their own address space, thus
> keeping the nodes under soc causes warnings:
> 
>   exynos5250-arndale.dtb: soc: video-phy-0: {'compatible': ['samsung,exynos5250-dp-video-phy'],
>     'samsung,pmu-syscon': [[20]], '#phy-cells': [[0]], 'phandle': [[24]]} should not be valid under {'type': 'object'}
> 
> [...]

Applied, thanks!

[7/8] ARM: dts: exynos: move DP and MIPI phys to PMU node in Exynos5250
      https://git.kernel.org/krzk/linux/c/6dc01bc640b1278f225ed73b891645202be72b55

Best regards,
-- 
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>