[PATCH] arm64: dts: mediatek: mt8188: Fix MERGE's alias IDs

[PATCH] arm64: dts: mediatek: mt8188: Fix MERGE's alias IDs

[Fei Shao]

MediaTek's ovl_adaptor driver requires the alias IDs of the MERGE
components to be indexed from 1 to 5 to construct the MT8188 vdosys1
routing path, since merge0 is particularly reserved for vdosys0
according to the mmsys routing tables.

Update the alias IDs to ensure that ovl_adaptor can find the correct
MERGE components, allowing DRM to initialize without issues.

Fixes: b13ecb7c6f67 ("arm64: dts: mediatek: mt8188: Add display nodes for vdosys1")
Signed-off-by: Fei Shao <fshao@chromium.org>
---

 arch/arm64/boot/dts/mediatek/mt8188.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/mediatek/mt8188.dtsi b/arch/arm64/boot/dts/mediatek/mt8188.dtsi
index b493207a1b68..8c2667ac2b64 100644
--- a/arch/arm64/boot/dts/mediatek/mt8188.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8188.dtsi
@@ -29,11 +29,11 @@ aliases {
 		ethdr0 = &ethdr0;
 		gce0 = &gce0;
 		gce1 = &gce1;
-		merge0 = &merge0;
 		merge1 = &merge1;
 		merge2 = &merge2;
 		merge3 = &merge3;
 		merge4 = &merge4;
+		merge5 = &merge5;
 		mutex0 = &mutex0;
 		mutex1 = &mutex1;
 		padding0 = &padding0;
@@ -2698,7 +2698,7 @@ vdo1_rdma7: rdma@1c10b000 {
 			mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xb000 0x1000>;
 		};
 
-		merge0: merge@1c10c000 {
+		merge1: merge@1c10c000 {
 			compatible = "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merge";
 			reg = <0 0x1c10c000 0 0x1000>;
 			clocks = <&vdosys1 CLK_VDO1_VPP_MERGE0>,
@@ -2711,7 +2711,7 @@ merge0: merge@1c10c000 {
 			mediatek,merge-mute;
 		};
 
-		merge1: merge@1c10d000 {
+		merge2: merge@1c10d000 {
 			compatible = "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merge";
 			reg = <0 0x1c10d000 0 0x1000>;
 			clocks = <&vdosys1 CLK_VDO1_VPP_MERGE1>,
@@ -2724,7 +2724,7 @@ merge1: merge@1c10d000 {
 			mediatek,merge-mute;
 		};
 
-		merge2: merge@1c10e000 {
+		merge3: merge@1c10e000 {
 			compatible = "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merge";
 			reg = <0 0x1c10e000 0 0x1000>;
 			clocks = <&vdosys1 CLK_VDO1_VPP_MERGE2>,
@@ -2737,7 +2737,7 @@ merge2: merge@1c10e000 {
 			mediatek,merge-mute;
 		};
 
-		merge3: merge@1c10f000 {
+		merge4: merge@1c10f000 {
 			compatible = "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merge";
 			reg = <0 0x1c10f000 0 0x1000>;
 			clocks = <&vdosys1 CLK_VDO1_VPP_MERGE3>,
@@ -2750,7 +2750,7 @@ merge3: merge@1c10f000 {
 			mediatek,merge-mute;
 		};
 
-		merge4: merge@1c110000 {
+		merge5: merge@1c110000 {
 			compatible = "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merge";
 			reg = <0 0x1c110000 0 0x1000>;
 			clocks = <&vdosys1 CLK_VDO1_VPP_MERGE4>,
-- 
2.47.0.rc1.288.g06298d1525-goog

Re: [PATCH] arm64: dts: mediatek: mt8188: Fix MERGE's alias IDs

[AngeloGioacchino Del Regno]

Il 14/10/24 11:45, Fei Shao ha scritto:
> MediaTek's ovl_adaptor driver requires the alias IDs of the MERGE
> components to be indexed from 1 to 5 to construct the MT8188 vdosys1
> routing path, since merge0 is particularly reserved for vdosys0
> according to the mmsys routing tables.
> 
> Update the alias IDs to ensure that ovl_adaptor can find the correct
> MERGE components, allowing DRM to initialize without issues.
> 
> Fixes: b13ecb7c6f67 ("arm64: dts: mediatek: mt8188: Add display nodes for vdosys1")
> Signed-off-by: Fei Shao <fshao@chromium.org>

I prefer that you resend the original series with this fix squashed into
the right commit instead, as I can still replace the series that I picked.

That makes things cleaner, so please do that.

Thanks,
Angelo

Re: [PATCH] arm64: dts: mediatek: mt8188: Fix MERGE's alias IDs

[Fei Shao]

On Mon, Oct 14, 2024 at 6:34 PM AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com> wrote:
>
> Il 14/10/24 11:45, Fei Shao ha scritto:
> > MediaTek's ovl_adaptor driver requires the alias IDs of the MERGE
> > components to be indexed from 1 to 5 to construct the MT8188 vdosys1
> > routing path, since merge0 is particularly reserved for vdosys0
> > according to the mmsys routing tables.
> >
> > Update the alias IDs to ensure that ovl_adaptor can find the correct
> > MERGE components, allowing DRM to initialize without issues.
> >
> > Fixes: b13ecb7c6f67 ("arm64: dts: mediatek: mt8188: Add display nodes for vdosys1")
> > Signed-off-by: Fei Shao <fshao@chromium.org>
>
> I prefer that you resend the original series with this fix squashed into
> the right commit instead, as I can still replace the series that I picked.
>
> That makes things cleaner, so please do that.

I see, I'll resend that later, thanks!

Fei

>
> Thanks,
> Angelo
>