From patchwork Mon Oct 14 09:45:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Shao X-Patchwork-Id: 13834580 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D42C8CFC52C for ; Mon, 14 Oct 2024 10:04:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=lGAj2jLrEzgkhSMMiUrwfy4iHgtWvXHx4K4cAraijBo=; b=gjk91QKvjFp7ju5LzPGpcXRkkF WenQ3J4sFIUbfrYB9p2WwwwcaPxfFRIOKsKKtPlNrL/8aRt9eIvE9Yc7kxoC/QdaahbWl8oTPgEuZ +CnVMtf3fv2HdPvW1PkALOsUrqCSyBAtCr823AtzfR1ubwPDn2e9uCj2HJpb6RCnVdG50BjGehGWu nSDT4AnMH05wLCuJ6oSvQOjBSwf87YXagGApVvaKTdF2yCoMiU/6PXdcI5ZOHN3TcOdNCwL9BFGHX h8BSHd0KnC8719YNMR8VRRRP96j0SgUvCtirUQ/H/b+VaqxlU9LGTtZHf3Hp01vhDzuxMwWVFJcNX tFFCffCw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t0HwD-00000004dUH-1x1H; Mon, 14 Oct 2024 10:04:29 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t0Hew-00000004aZ5-3D21 for linux-arm-kernel@lists.infradead.org; Mon, 14 Oct 2024 09:46:41 +0000 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-71de9e1f374so2810830b3a.1 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=lists.infradead.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=VI9I2aWW5zhQ54h9xE0LkFBWda93/yqPCh2ou1s/WvjbaWx1ey4U/ijl45n1JatJZS f1H/OlmJeg714UFQZuljwaB0RCikQkNBVfjsjzb9UTOWQWyZUvxe5/CxIZ0QONAzYqHx /x4U53sxHYN0q1rYVeqmjL7xj7uawVOPgvNCc= 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=YJt3XI1qTQrt+fl/nZNpb8IDXgfvXJ9WifH+D7wjEXY7Cb+76upnB6gzOiRLDfRyd9 jRRLH58XvVqP0kUEmaNLQyWv5TUTzfDBdY/CD7X344XdBp6kkZ4PtlTwT5OSthqbxrnz TXNbjfsc8aMXOffy3UVnvxacikiCVFqJo/2STZDw3+z6DGKhczA43lfW6t7eRsfowxDX GWQ3Qb9/G8PR+7f67up8GjiYBHHMmmzAkjvgZUS5LZBx3Y0lpt42kdLTTBwTam5ECEAA 8RITPeEj36bdZDiUXbrP6IoGe+OM70fGlj+s/ti/n9sH0qzeDicjibpUGYN6Ueu56BL0 +5mA== X-Forwarded-Encrypted: i=1; AJvYcCW9dHuF3BbBWqtVZvm9tLpUqk4bhxc4d1h9XwaHaW1qiXIfbqfyoeznDvA7kVEJoCMxru6oIjeDqkpckybn5VBn@lists.infradead.org X-Gm-Message-State: AOJu0YyT9bY3CL79sCx+B1wxziGM1mtG/UQ6b1NeRIOXGJyzCldOm8ie 0yW9EFLQ+2QOMK3MzxmAD68Bw5RXfKKO+yF8cKngJ+VK7QlUL0T7Y+NOjnXg6Q== 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 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241014_024638_855575_022F9D62 X-CRM114-Status: GOOD ( 11.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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 = ðdr0; 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>,