From: Sasha Levin Date: Sun, 23 Feb 2025 13:18:04 +0000 (-0500) Subject: Drop two mt8183 backports from 6.6 X-Git-Tag: v6.6.80~25^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59136ff81ffc12735116af5a60dae531e5fd5291;p=thirdparty%2Fkernel%2Fstable-queue.git Drop two mt8183 backports from 6.6 Signed-off-by: Sasha Levin --- diff --git a/queue-6.6/arm64-dts-mediatek-mt8183-disable-dsi-display-output.patch b/queue-6.6/arm64-dts-mediatek-mt8183-disable-dsi-display-output.patch deleted file mode 100644 index adce8d0b41..0000000000 --- a/queue-6.6/arm64-dts-mediatek-mt8183-disable-dsi-display-output.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c63c74776e36f2386af8cef549aae9dba64af4e5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 15:56:28 +0800 -Subject: arm64: dts: mediatek: mt8183: Disable DSI display output by default - -From: Chen-Yu Tsai - -[ Upstream commit 26f6e91fa29a58fdc76b47f94f8f6027944a490c ] - -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: stable@vger.kernel.org -Signed-off-by: Chen-Yu Tsai -Reviewed-by: Fei Shao -Link: https://lore.kernel.org/r/20241025075630.3917458-2-wenst@chromium.org -Signed-off-by: AngeloGioacchino Del Regno -Signed-off-by: Sasha Levin ---- - 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 cc24cd3aded1c..63c7c65d7f4fd 100644 ---- a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts -+++ b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts -@@ -524,10 +524,6 @@ - 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 d1b6355148620..f3a1b96f1ee4d 100644 ---- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi -+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi -@@ -1828,6 +1828,7 @@ - resets = <&mmsys MT8183_MMSYS_SW0_RST_B_DISP_DSI0>; - phys = <&mipi_tx0>; - phy-names = "dphy"; -+ status = "disabled"; - }; - - mutex: mutex@14016000 { --- -2.39.5 - diff --git a/queue-6.6/arm64-dts-mediatek-mt8183-pumpkin-add-hdmi-support.patch b/queue-6.6/arm64-dts-mediatek-mt8183-pumpkin-add-hdmi-support.patch deleted file mode 100644 index ec30643c9b..0000000000 --- a/queue-6.6/arm64-dts-mediatek-mt8183-pumpkin-add-hdmi-support.patch +++ /dev/null @@ -1,184 +0,0 @@ -From 97ec9ef530c7bd3554acee79c276b8582075c785 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 19 Sep 2024 17:41:49 +0800 -Subject: arm64: dts: mediatek: mt8183-pumpkin: add HDMI support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Fabien Parent - -[ Upstream commit 72f3e3d68cfda508ec4b6c8927c50814229cd04e ] - -The MT8183 Pumpkin board has a micro-HDMI connector. HDMI support is -provided by an IT66121 DPI <-> HDMI bridge. - -Enable the DPI and add the node for the IT66121 bridge. - -Signed-off-by: Fabien Parent -Co-developed-by: Pin-yen Lin -Signed-off-by: Pin-yen Lin -Reviewed-by: Nícolas F. R. A. Prado -Link: https://lore.kernel.org/r/20240919094212.1902073-1-treapking@chromium.org -Signed-off-by: AngeloGioacchino Del Regno -Stable-dep-of: 26f6e91fa29a ("arm64: dts: mediatek: mt8183: Disable DSI display output by default") -Signed-off-by: Sasha Levin ---- - .../boot/dts/mediatek/mt8183-pumpkin.dts | 123 ++++++++++++++++++ - 1 file changed, 123 insertions(+) - -diff --git a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts -index b5784a60c315d..cc24cd3aded1c 100644 ---- a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts -+++ b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts -@@ -63,6 +63,18 @@ - pulldown-ohm = <0>; - io-channels = <&auxadc 0>; - }; -+ -+ connector { -+ compatible = "hdmi-connector"; -+ label = "hdmi"; -+ type = "d"; -+ -+ port { -+ hdmi_connector_in: endpoint { -+ remote-endpoint = <&hdmi_connector_out>; -+ }; -+ }; -+ }; - }; - - &auxadc { -@@ -120,6 +132,43 @@ - pinctrl-0 = <&i2c6_pins>; - status = "okay"; - clock-frequency = <100000>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ it66121hdmitx: hdmitx@4c { -+ compatible = "ite,it66121"; -+ reg = <0x4c>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&ite_pins>; -+ reset-gpios = <&pio 160 GPIO_ACTIVE_LOW>; -+ interrupt-parent = <&pio>; -+ interrupts = <4 IRQ_TYPE_LEVEL_LOW>; -+ vcn33-supply = <&mt6358_vcn33_reg>; -+ vcn18-supply = <&mt6358_vcn18_reg>; -+ vrf12-supply = <&mt6358_vrf12_reg>; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ port@0 { -+ reg = <0>; -+ -+ it66121_in: endpoint { -+ bus-width = <12>; -+ remote-endpoint = <&dpi_out>; -+ }; -+ }; -+ -+ port@1 { -+ reg = <1>; -+ -+ hdmi_connector_out: endpoint { -+ remote-endpoint = <&hdmi_connector_in>; -+ }; -+ }; -+ }; -+ }; - }; - - &keyboard { -@@ -368,6 +417,67 @@ - input-enable; - }; - }; -+ -+ ite_pins: ite-pins { -+ pins-irq { -+ pinmux = ; -+ input-enable; -+ bias-pull-up; -+ }; -+ -+ pins-rst { -+ pinmux = ; -+ output-high; -+ }; -+ }; -+ -+ dpi_func_pins: dpi-func-pins { -+ pins-dpi { -+ pinmux = , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ }; -+ }; -+ -+ dpi_idle_pins: dpi-idle-pins { -+ pins-idle { -+ pinmux = , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ }; -+ }; - }; - - &mfg { -@@ -417,3 +527,16 @@ - &dsi0 { - status = "disabled"; - }; -+ -+&dpi0 { -+ pinctrl-names = "default", "sleep"; -+ pinctrl-0 = <&dpi_func_pins>; -+ pinctrl-1 = <&dpi_idle_pins>; -+ status = "okay"; -+ -+ port { -+ dpi_out: endpoint { -+ remote-endpoint = <&it66121_in>; -+ }; -+ }; -+}; --- -2.39.5 - diff --git a/queue-6.6/series b/queue-6.6/series index 5d7f50c6da..48e2c45692 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -45,8 +45,6 @@ asoc-renesas-rz-ssi-add-a-check-for-negative-sample_.patch firmware-qcom-scm-fix-missing-read-barrier-in-qcom_s.patch scsi-core-handle-depopulation-and-restoration-in-pro.patch scsi-core-do-not-retry-i-os-during-depopulation.patch -arm64-dts-mediatek-mt8183-pumpkin-add-hdmi-support.patch -arm64-dts-mediatek-mt8183-disable-dsi-display-output.patch arm64-dts-qcom-sm8450-add-missing-qcom-non-secure-do.patch arm64-dts-qcom-sm8450-fix-adsp-memory-base-and-lengt.patch arm64-dts-qcom-sm8550-add-dma-coherent-property.patch