diff mbox series

[6/8] ARM: dts: exynos: move DP and MIPI phys to PMU node in Exynos5420

Message ID 20230127194057.186458-7-krzysztof.kozlowski@linaro.org
State Handled Elsewhere
Headers show
Series dt-bindings: phy/samsung: move MIPI and DP phys under PMU | expand

Commit Message

Krzysztof Kozlowski Jan. 27, 2023, 7:40 p.m. UTC
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:

  exynos5420-smdk5420.dtb: soc: dp-video-phy: {'compatible': ['samsung,exynos5420-dp-video-phy'],
    'samsung,pmu-syscon': [[11]], '#phy-cells': [[0]], 'phandle': [[16]]} should not be valid under {'type': 'object'}

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

Comments

Marek Szyprowski Jan. 27, 2023, 10:54 p.m. UTC | #1
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:
>
>    exynos5420-smdk5420.dtb: soc: dp-video-phy: {'compatible': ['samsung,exynos5420-dp-video-phy'],
>      'samsung,pmu-syscon': [[11]], '#phy-cells': [[0]], 'phandle': [[16]]} 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/exynos5420.dtsi | 24 +++++++++++-------------
>   1 file changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
> index b1051a7d07af..6cdb1a832fb9 100644
> --- a/arch/arm/boot/dts/exynos5420.dtsi
> +++ b/arch/arm/boot/dts/exynos5420.dtsi
> @@ -585,18 +585,6 @@ spi_2: spi@12d40000 {
>   			status = "disabled";
>   		};
>   
> -		dp_phy: dp-video-phy {
> -			compatible = "samsung,exynos5420-dp-video-phy";
> -			samsung,pmu-syscon = <&pmu_system_controller>;
> -			#phy-cells = <0>;
> -		};
> -
> -		mipi_phy: mipi-video-phy {
> -			compatible = "samsung,exynos5420-mipi-video-phy";
> -			syscon = <&pmu_system_controller>;
> -			#phy-cells = <1>;
> -		};
> -
>   		dsi: dsi@14500000 {
>   			compatible = "samsung,exynos5410-mipi-dsi";
>   			reg = <0x14500000 0x10000>;
> @@ -822,7 +810,7 @@ jpeg_1: jpeg@11f60000 {
>   		};
>   
>   		pmu_system_controller: system-controller@10040000 {
> -			compatible = "samsung,exynos5420-pmu", "syscon";
> +			compatible = "samsung,exynos5420-pmu", "simple-mfd", "syscon";
>   			reg = <0x10040000 0x5000>;
>   			clock-names = "clkout16";
>   			clocks = <&clock CLK_FIN_PLL>;
> @@ -830,6 +818,16 @@ pmu_system_controller: system-controller@10040000 {
>   			interrupt-controller;
>   			#interrupt-cells = <3>;
>   			interrupt-parent = <&gic>;
> +
> +			dp_phy: dp-phy {
> +				compatible = "samsung,exynos5420-dp-video-phy";
> +				#phy-cells = <0>;
> +			};
> +
> +			mipi_phy: mipi-phy {
> +				compatible = "samsung,exynos5420-mipi-video-phy";
> +				#phy-cells = <1>;
> +			};
>   		};
>   
>   		tmu_cpu0: tmu@10060000 {

Best regards
Krzysztof Kozlowski March 6, 2023, 11:39 a.m. UTC | #2
On Fri, 27 Jan 2023 20:40:55 +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:
> 
>   exynos5420-smdk5420.dtb: soc: dp-video-phy: {'compatible': ['samsung,exynos5420-dp-video-phy'],
>     'samsung,pmu-syscon': [[11]], '#phy-cells': [[0]], 'phandle': [[16]]} should not be valid under {'type': 'object'}
> 
> [...]

Applied, thanks!

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

Best regards,
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index b1051a7d07af..6cdb1a832fb9 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -585,18 +585,6 @@  spi_2: spi@12d40000 {
 			status = "disabled";
 		};
 
-		dp_phy: dp-video-phy {
-			compatible = "samsung,exynos5420-dp-video-phy";
-			samsung,pmu-syscon = <&pmu_system_controller>;
-			#phy-cells = <0>;
-		};
-
-		mipi_phy: mipi-video-phy {
-			compatible = "samsung,exynos5420-mipi-video-phy";
-			syscon = <&pmu_system_controller>;
-			#phy-cells = <1>;
-		};
-
 		dsi: dsi@14500000 {
 			compatible = "samsung,exynos5410-mipi-dsi";
 			reg = <0x14500000 0x10000>;
@@ -822,7 +810,7 @@  jpeg_1: jpeg@11f60000 {
 		};
 
 		pmu_system_controller: system-controller@10040000 {
-			compatible = "samsung,exynos5420-pmu", "syscon";
+			compatible = "samsung,exynos5420-pmu", "simple-mfd", "syscon";
 			reg = <0x10040000 0x5000>;
 			clock-names = "clkout16";
 			clocks = <&clock CLK_FIN_PLL>;
@@ -830,6 +818,16 @@  pmu_system_controller: system-controller@10040000 {
 			interrupt-controller;
 			#interrupt-cells = <3>;
 			interrupt-parent = <&gic>;
+
+			dp_phy: dp-phy {
+				compatible = "samsung,exynos5420-dp-video-phy";
+				#phy-cells = <0>;
+			};
+
+			mipi_phy: mipi-phy {
+				compatible = "samsung,exynos5420-mipi-video-phy";
+				#phy-cells = <1>;
+			};
 		};
 
 		tmu_cpu0: tmu@10060000 {