+++ /dev/null
-From c63c74776e36f2386af8cef549aae9dba64af4e5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 25 Oct 2024 15:56:28 +0800
-Subject: arm64: dts: mediatek: mt8183: Disable DSI display output by default
-
-From: Chen-Yu Tsai <wenst@chromium.org>
-
-[ 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 <wenst@chromium.org>
-Reviewed-by: Fei Shao <fshao@chromium.org>
-Link: https://lore.kernel.org/r/20241025075630.3917458-2-wenst@chromium.org
-Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
+++ /dev/null
-From 97ec9ef530c7bd3554acee79c276b8582075c785 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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 <fparent@baylibre.com>
-
-[ 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 <fparent@baylibre.com>
-Co-developed-by: Pin-yen Lin <treapking@chromium.org>
-Signed-off-by: Pin-yen Lin <treapking@chromium.org>
-Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
-Link: https://lore.kernel.org/r/20240919094212.1902073-1-treapking@chromium.org
-Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Stable-dep-of: 26f6e91fa29a ("arm64: dts: mediatek: mt8183: Disable DSI display output by default")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../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 = <PINMUX_GPIO4__FUNC_GPIO4>;
-+ input-enable;
-+ bias-pull-up;
-+ };
-+
-+ pins-rst {
-+ pinmux = <PINMUX_GPIO160__FUNC_GPIO160>;
-+ output-high;
-+ };
-+ };
-+
-+ dpi_func_pins: dpi-func-pins {
-+ pins-dpi {
-+ pinmux = <PINMUX_GPIO12__FUNC_I2S5_BCK>,
-+ <PINMUX_GPIO46__FUNC_I2S5_LRCK>,
-+ <PINMUX_GPIO47__FUNC_I2S5_DO>,
-+ <PINMUX_GPIO13__FUNC_DBPI_D0>,
-+ <PINMUX_GPIO14__FUNC_DBPI_D1>,
-+ <PINMUX_GPIO15__FUNC_DBPI_D2>,
-+ <PINMUX_GPIO16__FUNC_DBPI_D3>,
-+ <PINMUX_GPIO17__FUNC_DBPI_D4>,
-+ <PINMUX_GPIO18__FUNC_DBPI_D5>,
-+ <PINMUX_GPIO19__FUNC_DBPI_D6>,
-+ <PINMUX_GPIO20__FUNC_DBPI_D7>,
-+ <PINMUX_GPIO21__FUNC_DBPI_D8>,
-+ <PINMUX_GPIO22__FUNC_DBPI_D9>,
-+ <PINMUX_GPIO23__FUNC_DBPI_D10>,
-+ <PINMUX_GPIO24__FUNC_DBPI_D11>,
-+ <PINMUX_GPIO25__FUNC_DBPI_HSYNC>,
-+ <PINMUX_GPIO26__FUNC_DBPI_VSYNC>,
-+ <PINMUX_GPIO27__FUNC_DBPI_DE>,
-+ <PINMUX_GPIO28__FUNC_DBPI_CK>;
-+ };
-+ };
-+
-+ dpi_idle_pins: dpi-idle-pins {
-+ pins-idle {
-+ pinmux = <PINMUX_GPIO12__FUNC_GPIO12>,
-+ <PINMUX_GPIO46__FUNC_GPIO46>,
-+ <PINMUX_GPIO47__FUNC_GPIO47>,
-+ <PINMUX_GPIO13__FUNC_GPIO13>,
-+ <PINMUX_GPIO14__FUNC_GPIO14>,
-+ <PINMUX_GPIO15__FUNC_GPIO15>,
-+ <PINMUX_GPIO16__FUNC_GPIO16>,
-+ <PINMUX_GPIO17__FUNC_GPIO17>,
-+ <PINMUX_GPIO18__FUNC_GPIO18>,
-+ <PINMUX_GPIO19__FUNC_GPIO19>,
-+ <PINMUX_GPIO20__FUNC_GPIO20>,
-+ <PINMUX_GPIO21__FUNC_GPIO21>,
-+ <PINMUX_GPIO22__FUNC_GPIO22>,
-+ <PINMUX_GPIO23__FUNC_GPIO23>,
-+ <PINMUX_GPIO24__FUNC_GPIO24>,
-+ <PINMUX_GPIO25__FUNC_GPIO25>,
-+ <PINMUX_GPIO26__FUNC_GPIO26>,
-+ <PINMUX_GPIO27__FUNC_GPIO27>,
-+ <PINMUX_GPIO28__FUNC_GPIO28>;
-+ };
-+ };
- };
-
- &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
-
projects / thirdparty / kernel / stable-queue.git / commitdiff
