From nobody Wed Nov 27 02:26:17 2024 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8013E146A79 for ; Mon, 14 Oct 2024 09:46:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728899199; cv=none; b=TVig9N/zpCbnDactwDeccJRG4aB+D57Swi2RMq4Hnx2z2iv9p1mCw5iR/fhFjZZOkY5V7AcAsje/Px+JtV48JVMfra09LvyJqTm9omJIsYAuDTa4ZkbvHM/o4aa1KhMB2gTJij1a+reg2+Fs0cLyZiHvnfACwPoDB/0CNsRD59k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728899199; c=relaxed/simple; bh=7HJuvEBcwEpXl1rm+VkEP99GiRmo5Ws1/QFXKSNn/qk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=OFs+fkQlbEphVWQOBr67sFvG4+ZFr9EXfUkPuZJVFD85f3/trB3PpjyaTw2uNkyx6K3jMUTdpGe7mcCGfEWNMOjrWuNWbE9Xn2i9RcKSeDuFrtFPSs95hOC9nUlrNmuoiKpBcxyNsmCuN7YtW1W7Dz4q4AKqPzd7Xtj4CtaQQu8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=SImFC5Ea; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="SImFC5Ea" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-71e3fce4a60so1746745b3a.0 for ; Mon, 14 Oct 2024 02:46:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1728899198; x=1729503998; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=lGAj2jLrEzgkhSMMiUrwfy4iHgtWvXHx4K4cAraijBo=; b=SImFC5EaREWd8gs24wgaAoknvHx302XzDNfplHg2g2JU5ZvEwEfsUWvPOW0lOW2dt7 XbJafNwiO0bYgmJTZjgrd+WOZRGGnsyZrms3e50YAJfNVGqvZodMZZyrF6WvK8ANaXFU uf+LroWRBNvgWWD5/ke5XlSmDp6aLi6KZVKbk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728899198; x=1729503998; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lGAj2jLrEzgkhSMMiUrwfy4iHgtWvXHx4K4cAraijBo=; b=pyE0rWURKSQpGvX4NjqXTHPmRZ8Taxs12UMo5P4p+/Az9YjxyLOVktWTXQrWYcjfLa n1gmZziMqAdg5r/ZuDrOo07u/ZdO3jwMzy1fIxkcOO3QNTx/A5GSStVAuhEG3Fx3DcI1 njrFOYZz1wDR/QSp5LjwHemU6vhdn/ckf1Q0oByv7mbzRwVDnxWEv6CQbqXpaxYMoZBS cj+IbFyf/lre1roEtqv6rJ4Um2UkAChPZHN9RjXfgOoDzPu6eBmCQ/S5zoTMmJ/KMXGC FtYiBK0dVahcknuA09RQlUN4B+px5ps7Ph0samdbgOe8kTVve1wHeGjJ5TyUYI88dptC +oSw== X-Forwarded-Encrypted: i=1; AJvYcCU/ngsq/C0D8M1sMRrAsFjdIJzl40Q01Fna+02vbQgmFWt+ZM94tZYrmZlhWAgdi/BsbDyvAiwmDCTndXA=@vger.kernel.org X-Gm-Message-State: AOJu0YwrDW+8eu0mJhBvi7uIEYMkM7vVflEmkZpxD1Wcwaz+UYtLloCw xIb/y8X7x7/dA79o9545xiWcw5bajM/tJBq6q/9jBx1b1HGDQ+7abVJ/YT3i1Q== X-Google-Smtp-Source: AGHT+IGZNvapvPp6Etbzc/rr1MG2WKLL55pkoqmLVJ0fD4PI/ZmMSCXiEmbU2xQIPmAA26hDfWLABw== X-Received: by 2002:a05:6a00:2ea3:b0:71e:69e:596a with SMTP id d2e1a72fcca58-71e38074bc2mr17890339b3a.25.1728899197736; Mon, 14 Oct 2024 02:46:37 -0700 (PDT) Received: from fshao-p620.tpe.corp.google.com ([2401:fa00:1:10:4907:d52a:1a1a:58d0]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e4868e657sm4891705b3a.67.2024.10.14.02.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 02:46:37 -0700 (PDT) From: Fei Shao To: AngeloGioacchino Del Regno , Matthias Brugger Cc: Fei Shao , Conor Dooley , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH] arm64: dts: mediatek: mt8188: Fix MERGE's alias IDs Date: Mon, 14 Oct 2024 17:45:31 +0800 Message-ID: <20241014094622.1720289-1-fshao@chromium.org> X-Mailer: git-send-email 2.47.0.rc1.288.g06298d1525-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 v= dosys1") Signed-off-by: Fei Shao --- 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 =3D ðdr0; gce0 =3D &gce0; gce1 =3D &gce1; - merge0 =3D &merge0; merge1 =3D &merge1; merge2 =3D &merge2; merge3 =3D &merge3; merge4 =3D &merge4; + merge5 =3D &merge5; mutex0 =3D &mutex0; mutex1 =3D &mutex1; padding0 =3D &padding0; @@ -2698,7 +2698,7 @@ vdo1_rdma7: rdma@1c10b000 { mediatek,gce-client-reg =3D <&gce0 SUBSYS_1c10XXXX 0xb000 0x1000>; }; =20 - merge0: merge@1c10c000 { + merge1: merge@1c10c000 { compatible =3D "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merg= e"; reg =3D <0 0x1c10c000 0 0x1000>; clocks =3D <&vdosys1 CLK_VDO1_VPP_MERGE0>, @@ -2711,7 +2711,7 @@ merge0: merge@1c10c000 { mediatek,merge-mute; }; =20 - merge1: merge@1c10d000 { + merge2: merge@1c10d000 { compatible =3D "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merg= e"; reg =3D <0 0x1c10d000 0 0x1000>; clocks =3D <&vdosys1 CLK_VDO1_VPP_MERGE1>, @@ -2724,7 +2724,7 @@ merge1: merge@1c10d000 { mediatek,merge-mute; }; =20 - merge2: merge@1c10e000 { + merge3: merge@1c10e000 { compatible =3D "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merg= e"; reg =3D <0 0x1c10e000 0 0x1000>; clocks =3D <&vdosys1 CLK_VDO1_VPP_MERGE2>, @@ -2737,7 +2737,7 @@ merge2: merge@1c10e000 { mediatek,merge-mute; }; =20 - merge3: merge@1c10f000 { + merge4: merge@1c10f000 { compatible =3D "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merg= e"; reg =3D <0 0x1c10f000 0 0x1000>; clocks =3D <&vdosys1 CLK_VDO1_VPP_MERGE3>, @@ -2750,7 +2750,7 @@ merge3: merge@1c10f000 { mediatek,merge-mute; }; =20 - merge4: merge@1c110000 { + merge5: merge@1c110000 { compatible =3D "mediatek,mt8188-disp-merge", "mediatek,mt8195-disp-merg= e"; reg =3D <0 0x1c110000 0 0x1000>; clocks =3D <&vdosys1 CLK_VDO1_VPP_MERGE4>, --=20 2.47.0.rc1.288.g06298d1525-goog