2023-03-19 17:42:12

by Rob Herring (Arm)

Subject: [PATCH] arm64/arm: dts: rockchip: Fix DSI node names

DSI bus/controller nodes should be named 'dsi' rather than 'mipi'.

Signed-off-by: Rob Herring <[email protected]>
---
arch/arm/boot/dts/rk3288.dtsi | 2 +-
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 2ca76b69add7..d401b850583c 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -1114,7 +1114,7 @@ vopl_mmu: iommu@ff940300 {
status = "disabled";
};

- mipi_dsi: mipi@ff960000 {
+ mipi_dsi: dsi@ff960000 {
compatible = "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi";
reg = <0x0 0xff960000 0x0 0x4000>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 1881b4b71f91..e44e1c40c0ba 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1954,7 +1954,7 @@ hdmi_in_vopl: endpoint@1 {
};
};

- mipi_dsi: mipi@ff960000 {
+ mipi_dsi: dsi@ff960000 {
compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi";
reg = <0x0 0xff960000 0x0 0x8000>;
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -1990,7 +1990,7 @@ mipi_in_vopl: endpoint@1 {
};
};

- mipi_dsi1: mipi@ff968000 {
+ mipi_dsi1: dsi@ff968000 {
compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi";
reg = <0x0 0xff968000 0x0 0x8000>;
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH 0>;
--
2.39.2

2023-03-19 19:36:27

by Johan Jonker

Subject: Re: [PATCH] arm64/arm: dts: rockchip: Fix DSI node names

On 3/19/23 18:41, Rob Herring wrote:
> DSI bus/controller nodes should be named 'dsi' rather than 'mipi'.

There's already a serie that does that.
Lack of communication becomes common.
More thing must be fixed to comply then this patch alone.

[PATCH v6 09/17] ARM: dts: rockchip: rk3288: fix dsi node
https://lore.kernel.org/linux-rockchip/[email protected]/

[PATCH v6 15/17] arm64: dts: rockchip: rk3399: fix dp node
https://lore.kernel.org/linux-rockchip/[email protected]/

>
> Signed-off-by: Rob Herring <[email protected]>
> ---
> arch/arm/boot/dts/rk3288.dtsi | 2 +-
> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
> index 2ca76b69add7..d401b850583c 100644
> --- a/arch/arm/boot/dts/rk3288.dtsi
> +++ b/arch/arm/boot/dts/rk3288.dtsi
> @@ -1114,7 +1114,7 @@ vopl_mmu: iommu@ff940300 {
> status = "disabled";
> };
>
> - mipi_dsi: mipi@ff960000 {
> + mipi_dsi: dsi@ff960000 {
> compatible = "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi";
> reg = <0x0 0xff960000 0x0 0x4000>;
> interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> index 1881b4b71f91..e44e1c40c0ba 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -1954,7 +1954,7 @@ hdmi_in_vopl: endpoint@1 {
> };
> };
>
> - mipi_dsi: mipi@ff960000 {
> + mipi_dsi: dsi@ff960000 {
> compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi";
> reg = <0x0 0xff960000 0x0 0x8000>;
> interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH 0>;
> @@ -1990,7 +1990,7 @@ mipi_in_vopl: endpoint@1 {
> };
> };
>
> - mipi_dsi1: mipi@ff968000 {
> + mipi_dsi1: dsi@ff968000 {
> compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi";
> reg = <0x0 0xff968000 0x0 0x8000>;
> interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH 0>;

2023-03-22 23:46:17

by Heiko Stuebner

Subject: Re: [PATCH] arm64/arm: dts: rockchip: Fix DSI node names

Am Sonntag, 19. M?rz 2023, 20:36:20 CET schrieb Johan Jonker:
>
> On 3/19/23 18:41, Rob Herring wrote:
> > DSI bus/controller nodes should be named 'dsi' rather than 'mipi'.
>
> There's already a serie that does that.

I've now applied Johan's patches that fixed a lot of these
naming issues and also the other things uncovered after the
yaml conversion.

Heiko