From patchwork Fri Oct 25 07:56:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 13850172 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 E4365D1171C for ; Fri, 25 Oct 2024 07:56:43 +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=6laKqa55/o0629X+75d0Pfs5pGBVZ/MLyO3PoLeX31M=; b=dWBK+C3yC7fiLxnTYdP4ToSx8K rXyUgpoiHwO+gzaTgFlrjaQ4XOTvUiyukNMOEU+bQrwJ4wcCg01A3EcG/gxuzHleQlX4TYM60idj6 A5wpPEj3PHXlqhoUDxWGnirEva+XzWygGf8Ptbce6t2D3qmoveYW4nW4vWdVUg7TrYPkiyUTTsZO3 +wEjIhW+3t49O+gH0j0g7nw+elZ5Jf6VRP0GM+0sP/mUDtsYijmmwT3cRsVrX2xMoxPmn0csKjy5m O5Wre7YgbtSta9ZGlnHiRM4OTaiRKCsjlYIWiiLTK11zF2+fujdgJ04/scSOUOc38dyXRWK6kaKLn 2y7xJOKw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t4FBa-00000002sZJ-2EDJ; Fri, 25 Oct 2024 07:56:42 +0000 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t4FBY-00000002sXS-1X5G for linux-mediatek@lists.infradead.org; Fri, 25 Oct 2024 07:56:41 +0000 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-2e2dc61bc41so1260421a91.1 for ; Fri, 25 Oct 2024 00:56:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1729842999; x=1730447799; 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=6laKqa55/o0629X+75d0Pfs5pGBVZ/MLyO3PoLeX31M=; b=eUJjqlSXLuKMibEA/2cZP23Lg88Cyy4zdIA4j3zaxmLNmQl2Wy/ejzEJt7Uv4no5Wa fv17NEGoPGf9sTx2NEnMdw+kMO1dO1W7x/nF/DJsKz8e0cAg/QrSvTV4RwHfY2D+wt2o ljyv9Q3D4YqTK/nOxUrN80KcytL+5rM33X5XQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729842999; x=1730447799; 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=6laKqa55/o0629X+75d0Pfs5pGBVZ/MLyO3PoLeX31M=; b=bzOIgul/hz44U0zoyDeme253gVgNu89Ktq8Mvrl+kVZb+FnWTlvo6eNcjLiduQ+535 GtJHQ7Bviq2HJfkgEykqk1JOtmT4fXDaEwSV2dcd92iY8omDajHj07A1iCOFxmdZh2mC JlAKpckHaH36frFQxOP7sY79WWzidGkGuAY+lEUSZdAbRfM2rD65V8yKnAHEDE9pkpqV 9tiGk6XRi1RisS8bfrQSHaVlLSjJltmARdvpqfkXDokohJFRBXRgnFkMGxPrcobGeBGQ OdRnrHxLZ86lPGKrF9wVe3jxG6QFwTOcV7w7OJtgOEalTIfZ2Z5Z5a7FCyYURmvmL6jN xw3w== X-Forwarded-Encrypted: i=1; AJvYcCU5Dl8AkYtfMWaLut5B3a+iii1iVXfctVPCByDFAX4s1SaZH+wjLbOmN2SPzAr6s9kQbMqSecYVvRZMqVgkJg==@lists.infradead.org X-Gm-Message-State: AOJu0YxRotdLd+RVgfH+6UaaddDwk4s8LyCV2Cb2JiRakUhfNQQ9A/vI GVHoojL+Y5FpzPTx0nnql94DpL9FYkSECpGh/CbojiuE1uSKjXwXNiEQlB2m2w== X-Google-Smtp-Source: AGHT+IFmmKGI2cs990SRzNz65POmVSt+7jqG6ghbGRlWIcpYgMGvGVtY/qLmA8mHzd2tQ8d9uEfU1g== X-Received: by 2002:a17:90b:3850:b0:2e2:d1a3:faf9 with SMTP id 98e67ed59e1d1-2e76b716566mr7196222a91.40.1729842998905; Fri, 25 Oct 2024 00:56:38 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:d8f:752c:c7f1:3169]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e77e4c9c1bsm2797553a91.19.2024.10.25.00.56.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2024 00:56:38 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , devicetree@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 1/2] arm64: dts: mediatek: mt8183: Disable DPI display output by default Date: Fri, 25 Oct 2024 15:56:27 +0800 Message-ID: <20241025075630.3917458-1-wenst@chromium.org> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241025_005640_450247_30ADFF42 X-CRM114-Status: GOOD ( 11.74 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org This reverts commit 377548f05bd0905db52a1d50e5b328b9b4eb049d. Most SoC dtsi files have the display output interfaces disabled by default, and only enabled on boards that utilize them. The MT8183 has it backwards: the display outputs are left enabled by default, and only disabled at the board level. Reverse the situation for the DPI output so that it follows the normal scheme. For ease of backporting the DSI output is handled in a separate patch. Fixes: 009d855a26fd ("arm64: dts: mt8183: add dpi node to mt8183") Fixes: 377548f05bd0 ("arm64: dts: mediatek: mt8183-kukui: Disable DPI display interface") Cc: Signed-off-by: Chen-Yu Tsai Reviewed-by: Fei Shao --- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 5 ----- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi index 07ae3c8e897b..22924f61ec9e 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi @@ -290,11 +290,6 @@ dsi_out: endpoint { }; }; -&dpi0 { - /* TODO Re-enable after DP to Type-C port muxing can be described */ - status = "disabled"; -}; - &gic { mediatek,broken-save-restore-fw; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi index 1afeeb1155f5..8f31fc9050ec 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi @@ -1845,6 +1845,7 @@ dpi0: dpi@14015000 { <&mmsys CLK_MM_DPI_MM>, <&apmixedsys CLK_APMIXED_TVDPLL>; clock-names = "pixel", "engine", "pll"; + status = "disabled"; port { dpi_out: endpoint { }; From patchwork Fri Oct 25 07:56:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 13850176 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 DE401D1171C for ; Fri, 25 Oct 2024 07:58:20 +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:References:In-Reply-To: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:List-Owner; bh=Ocz8O19Ri16sCIqDKqqWyBeGwEbvKhFKD3K8dqT+N6c=; b=wsVUGv8lyVEvumUIxYhEc2rlTO A+TC8xmUJwvOW2BV9VraSJUWEcEqdfmJeLA1N4W75xULxLegvvumr3gEkn8HIzKCC630m2gaNGXy8 APWycGUpXXRtf5iDmR7QWzQSbYoXRwEQMNHnbQvLaHhKv/+LsqirYIs/Y09Utk8G8jJG060ohPjJm DK+BGRXikL43g0BwhqOyb0B0jU/9q2zGU7vGFuaB1hGs+/wxw5rRc6NNsd3uPWAb+PXvGlOsxI8wP xvo4jOHDyUzoKs2xmA4p31szglgHKWoBzBZB9GrovrI6Pqq1Quva0tY8sTXVqEZ4QdMCYFlDD1AaN ERmfr1bg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t4FD9-00000002spw-3qdy; Fri, 25 Oct 2024 07:58:19 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t4FBZ-00000002sYV-3DWd for linux-mediatek@lists.infradead.org; Fri, 25 Oct 2024 07:56:43 +0000 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-2e5a0177531so1329479a91.2 for ; Fri, 25 Oct 2024 00:56:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1729843001; x=1730447801; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ocz8O19Ri16sCIqDKqqWyBeGwEbvKhFKD3K8dqT+N6c=; b=X0yFuEieUeXYQ7rd2MQ43x0rRA68NWy6F1FbGC9nGr2BvKfkB9hTRgzsr4cmsEUj2I MWIeAqIRN+RkF8fFsgzfOSnJpsFugz0SchlUYFiVOOcrCRaAjykAkSy5crWC6N2ppkZW X2HiFkYt/vEPf8jmjhpleb24bWrWCBwoP+PWw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729843001; x=1730447801; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ocz8O19Ri16sCIqDKqqWyBeGwEbvKhFKD3K8dqT+N6c=; b=lJcJCIMBCKXGSE8NUHUQnrzc8qhYFWq6sFUhVr18n0UiKXzusKURUcgGiwoplsJrCE 371taRW+e4jSemTWN7u1Q/X7xZI/nOJ5IaH9t/9m+MUoAeHKajNOVy/f91xz7fglO6de b08KIKqrQBnfxt0xsFVY6VwoqD3+qIoVYD7QzIIGJli1/d9A6dAb5BoEGOQYHJhvhftQ z1s/q5cBSq7g9HxstitFB1b0Ntt2xKwSf0LocEMm6E0UnWaMi3SQpDvtzjg2HrN8So5r BC1tJBOBk77TJr8sLkX/2mV/lkKMG+M8S9d4fz12eHIlF/LXFniVfwQisX1WIlQzQjZU ODZg== X-Forwarded-Encrypted: i=1; AJvYcCVbWWCsKCO3LqediNJznodHJgqcmEvQlZw7hae/S1OvpfS8OjwEgsoJcRGEqCHGiARToqQ6k+OeWAxFP8YvLA==@lists.infradead.org X-Gm-Message-State: AOJu0YyyM0bRDYtVw6H/gz8PHOkcZvKOIZZmyzynbV9F6qi9SSuFWf+5 iO1EsBZ4ZvFF+CmPDEbCpwRQlGJm1/WhI5jzfCdFgNh7VvkMo8DL/joAFuMvAw== X-Google-Smtp-Source: AGHT+IEhpzhZePgnGrlXh89W3IHK0viadpu28ous3jPT9MS8vhveF6ukqC0oYeARpOE5I3mtsl0sYA== X-Received: by 2002:a17:90b:30f:b0:2e2:e82d:48cf with SMTP id 98e67ed59e1d1-2e77f4a274amr4863299a91.16.1729843000877; Fri, 25 Oct 2024 00:56:40 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:d8f:752c:c7f1:3169]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e77e4c9c1bsm2797553a91.19.2024.10.25.00.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2024 00:56:40 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , devicetree@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: mediatek: mt8183: Disable DSI display output by default Date: Fri, 25 Oct 2024 15:56:28 +0800 Message-ID: <20241025075630.3917458-2-wenst@chromium.org> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog In-Reply-To: <20241025075630.3917458-1-wenst@chromium.org> References: <20241025075630.3917458-1-wenst@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241025_005641_876285_CB3FEA38 X-CRM114-Status: GOOD ( 12.77 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Most SoC dtsi files have the display output interfaces disabled by default, and only enabled on boards that utilize them. The MT8183 has it backwards: the display outputs are left enabled by default, and only disabled at the board level. Reverse the situation for the DSI output so that it follows the normal scheme. For ease of backporting the DPI output is handled in a separate patch. Fixes: 88ec840270e6 ("arm64: dts: mt8183: Add dsi node") Fixes: 19b6403f1e2a ("arm64: dts: mt8183: add mt8183 pumpkin board") Cc: Signed-off-by: Chen-Yu Tsai Reviewed-by: Fei Shao --- arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 4 ---- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts index 61a6f66914b8..dbdee604edab 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts @@ -522,10 +522,6 @@ &scp { status = "okay"; }; -&dsi0 { - status = "disabled"; -}; - &dpi0 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&dpi_func_pins>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi index 8f31fc9050ec..c7008bb8a81d 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi @@ -1834,6 +1834,7 @@ dsi0: dsi@14014000 { resets = <&mmsys MT8183_MMSYS_SW0_RST_B_DISP_DSI0>; phys = <&mipi_tx0>; phy-names = "dphy"; + status = "disabled"; }; dpi0: dpi@14015000 {