arm64: dts: mediatek: mt8183: Disable DPI display output by default

commit 93a680af46436780fd64f4e856a4cfa8b393be6e upstream.

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: stable@vger.kernel.org
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: Fei Shao <fshao@chromium.org>
Link: https://lore.kernel.org/r/20241025075630.3917458-1-wenst@chromium.org
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
index 07ae3c8e897b7d2e0bf83054309092c3018cb5ec..22924f61ec9ed26536f4940cb4439eedeadf0f89 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
@@ -290,11 +290,6 @@
        };
 };
 
-&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 9cd5e0cef02a29b0608d7225e408df648f8e9920..5cb6bd3c5acbb0f0686fc86899faa18062df1ae2 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
@@ -1846,6 +1846,7 @@
                                 <&mmsys CLK_MM_DPI_MM>,
                                 <&apmixedsys CLK_APMIXED_TVDPLL>;
                        clock-names = "pixel", "engine", "pll";
+                       status = "disabled";
 
                        port {
                                dpi_out: endpoint { };