diff mbox series

[8/8] arm64: dts: exynos: move MIPI phy to PMU node in Exynos5433

Message ID 20230127194057.186458-9-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 MIPI phy is actually part of the Power Management Unit system
controller.  It does not have own address space, thus keeping the node
under soc causes warnings:

  exynos5433-tm2e.dtb: soc@0: video-phy: {'compatible': ['samsung,exynos5433-mipi-video-phy'], ...
    should not be valid under {'type': 'object'}

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm64/boot/dts/exynos/exynos5433.dtsi | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Comments

Marek Szyprowski Jan. 27, 2023, 10:16 p.m. UTC | #1
On 27.01.2023 20:40, Krzysztof Kozlowski wrote:
> The MIPI phy is actually part of the Power Management Unit system
> controller.  It does not have own address space, thus keeping the node
> under soc causes warnings:
>
>    exynos5433-tm2e.dtb: soc@0: video-phy: {'compatible': ['samsung,exynos5433-mipi-video-phy'], ...
>      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/arm64/boot/dts/exynos/exynos5433.dtsi | 19 +++++++++----------
>   1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
> index 9da24fe958a3..842976addbd9 100644
> --- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi
> +++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
> @@ -911,12 +911,20 @@ pinctrl_touch: pinctrl@14ce0000 {
>   		};
>   
>   		pmu_system_controller: system-controller@105c0000 {
> -			compatible = "samsung,exynos5433-pmu", "syscon";
> +			compatible = "samsung,exynos5433-pmu", "simple-mfd", "syscon";
>   			reg = <0x105c0000 0x5008>;
>   			#clock-cells = <1>;
>   			clock-names = "clkout16";
>   			clocks = <&xxti>;
>   
> +			mipi_phy: mipi-phy {
> +				compatible = "samsung,exynos5433-mipi-video-phy";
> +				#phy-cells = <1>;
> +				samsung,cam0-sysreg = <&syscon_cam0>;
> +				samsung,cam1-sysreg = <&syscon_cam1>;
> +				samsung,disp-sysreg = <&syscon_disp>;
> +			};
> +
>   			reboot: syscon-reboot {
>   				compatible = "syscon-reboot";
>   				regmap = <&pmu_system_controller>;
> @@ -936,15 +944,6 @@ gic: interrupt-controller@11001000 {
>   			interrupts = <GIC_PPI 9 0xf04>;
>   		};
>   
> -		mipi_phy: video-phy {
> -			compatible = "samsung,exynos5433-mipi-video-phy";
> -			#phy-cells = <1>;
> -			samsung,pmu-syscon = <&pmu_system_controller>;
> -			samsung,cam0-sysreg = <&syscon_cam0>;
> -			samsung,cam1-sysreg = <&syscon_cam1>;
> -			samsung,disp-sysreg = <&syscon_disp>;
> -		};
> -
>   		decon: decon@13800000 {
>   			compatible = "samsung,exynos5433-decon";
>   			reg = <0x13800000 0x2104>;

Best regards
Krzysztof Kozlowski March 6, 2023, 11:39 a.m. UTC | #2
On Fri, 27 Jan 2023 20:40:57 +0100, Krzysztof Kozlowski wrote:
> The MIPI phy is actually part of the Power Management Unit system
> controller.  It does not have own address space, thus keeping the node
> under soc causes warnings:
> 
>   exynos5433-tm2e.dtb: soc@0: video-phy: {'compatible': ['samsung,exynos5433-mipi-video-phy'], ...
>     should not be valid under {'type': 'object'}
> 
> [...]

Applied, thanks!

[8/8] arm64: dts: exynos: move MIPI phy to PMU node in Exynos5433
      https://git.kernel.org/krzk/linux/c/2a9c708411834661e5b0ffb817a8f82f1a2f108e

Best regards,
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
index 9da24fe958a3..842976addbd9 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
@@ -911,12 +911,20 @@  pinctrl_touch: pinctrl@14ce0000 {
 		};
 
 		pmu_system_controller: system-controller@105c0000 {
-			compatible = "samsung,exynos5433-pmu", "syscon";
+			compatible = "samsung,exynos5433-pmu", "simple-mfd", "syscon";
 			reg = <0x105c0000 0x5008>;
 			#clock-cells = <1>;
 			clock-names = "clkout16";
 			clocks = <&xxti>;
 
+			mipi_phy: mipi-phy {
+				compatible = "samsung,exynos5433-mipi-video-phy";
+				#phy-cells = <1>;
+				samsung,cam0-sysreg = <&syscon_cam0>;
+				samsung,cam1-sysreg = <&syscon_cam1>;
+				samsung,disp-sysreg = <&syscon_disp>;
+			};
+
 			reboot: syscon-reboot {
 				compatible = "syscon-reboot";
 				regmap = <&pmu_system_controller>;
@@ -936,15 +944,6 @@  gic: interrupt-controller@11001000 {
 			interrupts = <GIC_PPI 9 0xf04>;
 		};
 
-		mipi_phy: video-phy {
-			compatible = "samsung,exynos5433-mipi-video-phy";
-			#phy-cells = <1>;
-			samsung,pmu-syscon = <&pmu_system_controller>;
-			samsung,cam0-sysreg = <&syscon_cam0>;
-			samsung,cam1-sysreg = <&syscon_cam1>;
-			samsung,disp-sysreg = <&syscon_disp>;
-		};
-
 		decon: decon@13800000 {
 			compatible = "samsung,exynos5433-decon";
 			reg = <0x13800000 0x2104>;