SB35 issue tracking

    cp -a ${DEPLOY_DIR_IMAGE}/devicetree ${tmp_pack_dir}

UBOOT_MACHINE = "mt8365_sb35_defconfig"

MACHINE_FEATURES:append = " alsa usbgadget usbhost wifi  screen"

pcm.speaker {

       type plug

       slave {

               pcm "hw:mtsndcard,1,0"

               channels 2

       }

}

		value true

		value true

From 05bb8f47e4d376d05f30ef95b170ac51aaac6478 Mon Sep 17 00:00:00 2001

From: Rockefeller Lin <rockefeller.lin@innocomm.com>

Date: Wed, 24 May 2023 12:18:47 +0800

Subject: [PATCH 1/1] Add dedicated sb35 defconfig and dts files

The defconfig and dts files are copied from mt8365-pumpkin.

---

 arch/arm/dts/Makefile         |   1 +

 arch/arm/dts/mt8365-sb35.dts  | 164 ++++++++++++++++++++++++++++++++++

 configs/mt8365_sb35_defconfig |  97 ++++++++++++++++++++

 3 files changed, 262 insertions(+)

 create mode 100644 arch/arm/dts/mt8365-sb35.dts

 create mode 100644 configs/mt8365_sb35_defconfig

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile

index 7b216bf62a..ac852fab60 100644

--- a/arch/arm/dts/Makefile

+++ b/arch/arm/dts/Makefile

@@ -1237,6 +1237,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \

 	mt8195-demo.dtb \

 	mt8195-evb-ufs.dtb \

 	mt8365-pumpkin.dtb \

+	mt8365-sb35.dtb \

 	mt8512-bm1-emmc.dtb \

 	mt8516-pumpkin.dtb \

 	mt8518-ap1-emmc.dtb \

diff --git a/arch/arm/dts/mt8365-sb35.dts b/arch/arm/dts/mt8365-sb35.dts

new file mode 100644

index 0000000000..5f57657026

--- /dev/null

+++ b/arch/arm/dts/mt8365-sb35.dts

@@ -0,0 +1,164 @@

+// SPDX-License-Identifier: GPL-2.0 OR MIT

+/*

+ * Copyright (C) 2021 BayLibre SAS.

+ * Author: Fabien Parent <fparent@baylibre.com>

+ */

+

+/dts-v1/;

+

+#include <config.h>

+#include "mt8365.dtsi"

+#include "mt6357.dtsi"

+

+/ {

+	model = "MT8365 SB35 board";

+	compatible = "mediatek,mt8365-sb35", "mediatek,mt8365";

+

+	memory@40000000 {

+		device_type = "memory";

+		reg = <0 0x40000000 0 0x40000000>;

+	};

+

+	firmware: firmware {

+		optee {

+			compatible = "linaro,optee-tz";

+			method = "smc";

+		};

+	};

+

+	reserved-memory {

+		#address-cells = <2>;

+		#size-cells = <2>;

+		ranges;

+

+		/* 192 KiB reserved for ARM Trusted Firmware (BL31) */

+		bl31_secmon_reserved: secmon@43000000 {

+			no-map;

+			reg = <0 0x43000000 0 0x30000>;

+		};

+

+		/* 12 MiB reserved for OP-TEE (BL32)

+		 * +-----------------------+ 0x43e0_0000

+		 * |      SHMEM 2MiB       |

+		 * +-----------------------+ 0x43c0_0000

+		 * |        | TA_RAM  8MiB |

+		 * + TZDRAM +--------------+ 0x4340_0000

+		 * |        | TEE_RAM 2MiB |

+		 * +-----------------------+ 0x4320_0000

+		 */

+		optee_reserved: optee@43200000 {

+			no-map;

+			reg = <0 0x43200000 0 0x00c00000>;

+		};

+	};

+

+	chosen {

+		stdout-path = &uart0;

+	};

+};

+

+&uart0 {

+	status = "okay";

+};

+

+&mmc0 {

+	bus-width = <4>;

+	max-frequency = <200000000>;

+	cap-mmc-highspeed;

+	mmc-hs200-1_8v;

+	cap-mmc-hw-reset;

+	vmmc-supply = <&mt6357_vemc_reg>;

+	vqmmc-supply = <&mt6357_vio18_reg>;

+	non-removable;

+	status = "okay";

+};

+

+&usb {

+	status = "okay";

+};

+

+&ssusb {

+	mediatek,force-vbus;

+	maximum-speed = "high-speed";

+	dr_mode = "peripheral";

+	status = "okay";

+};

+

+&dpi0 {

+	dpi_dual_edge;

+	pinctrl-names = "default", "sleep";

+	pinctrl-0 = <&dpi_pin_func>;

+	pinctrl-1 = <&dpi_pin_gpio>;

+	status = "okay";

+};

+

+&i2c0 {

+	pinctrl-names = "default";

+	pinctrl-0 = <&i2c0_pins_default>;

+	clock-frequency = <100000>;

+	status = "okay";

+};

+

+&i2c1 {

+	pinctrl-names = "default";

+	pinctrl-0 = <&i2c1_pins_default>;

+	clock-frequency = <100000>;

+	status = "okay";

+

+	it66121hdmitx {

+		compatible = "ite,it66121";

+		reg = <0x4c>;

+		pinctrl-names = "default";

+		pinctrl-0 = <&ite_pins_default>;

+		vcn33-supply = <&mt6357_vcn33_bt_reg>;

+		vcn18-supply = <&mt6357_vcn18_reg>;

+		vrf12-supply = <&mt6357_vrf12_reg>;

+		reset-gpios = <&gpio 69 GPIO_ACTIVE_LOW>;

+	};

+};

+

+&i2c2 {

+	pinctrl-names = "default";

+	pinctrl-0 = <&i2c2_pins_default>;

+	clock-frequency = <100000>;

+	status = "okay";

+};

+

+&pio {

+	dpi_pin_func: dpi_pin_func {

+		function = "dpi";

+		groups =  "dpi_enable";

+	};

+

+	dpi_pin_gpio: dpi_pin_gpio {

+		function = "dpi";

+		groups =  "dpi_sleep";

+	};

+

+	i2c0_pins_default: i2c0_pins_default {

+		function = "i2c";

+		groups = "i2c0";

+	};

+

+	i2c1_pins_default: i2c1_pins_default {

+		function = "i2c";

+		groups = "i2c1";

+	};

+

+	i2c2_pins_default: i2c2_pins_default {

+		function = "i2c";

+		groups = "i2c2";

+	};

+

+	ite_pins_default: ite_pins_default {

+		pins_rst_ite {

+			pinmux = <MT8365_PIN_69_CMDAT1__FUNC_GPIO69>;

+			output-high;

+		};

+

+		pins_irq_ite {

+			pinmux = <MT8365_PIN_68_CMDAT0__FUNC_GPIO68>;

+			input-enable;

+		};

+	};

+};

diff --git a/configs/mt8365_sb35_defconfig b/configs/mt8365_sb35_defconfig

new file mode 100644

index 0000000000..3c25705aab

--- /dev/null

+++ b/configs/mt8365_sb35_defconfig

@@ -0,0 +1,97 @@

+CONFIG_ARM=y

+CONFIG_COUNTER_FREQUENCY=13000000

+CONFIG_POSITION_INDEPENDENT=y

+CONFIG_ARCH_MEDIATEK=y

+CONFIG_SYS_TEXT_BASE=0x4c000000

+CONFIG_SYS_MALLOC_F_LEN=0x4000

+CONFIG_NR_DRAM_BANKS=1

+CONFIG_ENV_SIZE=0x1000

+CONFIG_ENV_OFFSET=0x0

+CONFIG_DM_GPIO=y

+CONFIG_DEFAULT_DEVICE_TREE="mt8365-sb35"

+CONFIG_TARGET_MT8365=y

+CONFIG_DEBUG_UART_BASE=0x11002000

+CONFIG_DEBUG_UART_CLOCK=26000000

+CONFIG_SYS_LOAD_ADDR=0x4c000000

+CONFIG_DEBUG_UART=y

+CONFIG_ENV_VARS_UBOOT_CONFIG=y

+# CONFIG_ANDROID_BOOT_IMAGE is not set

+CONFIG_FIT=y

+# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set

+CONFIG_USE_BOOTCOMMAND=y

+CONFIG_BOOTCOMMAND="run distro_bootcmd"

+CONFIG_DEFAULT_FDT_FILE="mt8365-sb35"

+# CONFIG_DISPLAY_BOARDINFO is not set

+CONFIG_HUSH_PARSER=y

+# CONFIG_CMD_CONSOLE is not set

+# CONFIG_CMD_BOOTD is not set

+# CONFIG_CMD_ELF is not set

+# CONFIG_CMD_GO is not set

+# CONFIG_CMD_IMI is not set

+# CONFIG_CMD_XIMG is not set

+# CONFIG_CMD_CRC32 is not set

+CONFIG_CMD_CLK=y

+CONFIG_CMD_DFU=y

+CONFIG_CMD_DM=y

+CONFIG_CMD_GPT=y

+# CONFIG_RANDOM_UUID is not set

+CONFIG_CMD_I2C=y

+# CONFIG_CMD_LOADB is not set

+# CONFIG_CMD_LOADS is not set

+CONFIG_CMD_MMC=y

+CONFIG_CMD_PART=y

+CONFIG_CMD_USB=y

+CONFIG_CMD_USB_MASS_STORAGE=y

+# CONFIG_CMD_ITEST is not set

+CONFIG_CMD_DHCP=y

+# CONFIG_CMD_BLOCK_CACHE is not set

+CONFIG_CMD_SYSBOOT=y

+CONFIG_CMD_EXT4=y

+CONFIG_CMD_FAT=y

+CONFIG_CMD_FS_GENERIC=y

+CONFIG_ISO_PARTITION=y

+CONFIG_ENV_IS_IN_MMC=y

+CONFIG_SYS_MMC_ENV_PART=2

+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

+CONFIG_ENV_IMPORT_FDT=y

+CONFIG_DEVRES=y

+CONFIG_CLK=y

+CONFIG_DFU_MMC=y

+CONFIG_USB_FUNCTION_FASTBOOT=y

+CONFIG_FASTBOOT_BUF_ADDR=0x4d000000

+CONFIG_FASTBOOT_BUF_SIZE=0x8000000

+CONFIG_FASTBOOT_FLASH=y

+CONFIG_FASTBOOT_FLASH_MMC_DEV=0

+CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y

+CONFIG_DM_I2C=y

+CONFIG_SYS_I2C_MTK=y

+# CONFIG_INPUT is not set

+# CONFIG_MMC_QUIRKS is not set

+CONFIG_MMC_MTK=y

+CONFIG_PHY=y

+CONFIG_PHY_MTK_TPHY=y

+CONFIG_PINCTRL=y

+CONFIG_PINCONF=y

+CONFIG_PINCTRL_MT8365=y

+CONFIG_DM_RTC=y

+CONFIG_RTC_EMULATION=y

+CONFIG_BAUDRATE=921600

+CONFIG_DM_SERIAL=y

+CONFIG_DEBUG_UART_ANNOUNCE=y

+CONFIG_MTK_SERIAL=y

+CONFIG_USB=y

+CONFIG_DM_USB_GADGET=y

+CONFIG_USB_XHCI_HCD=y

+CONFIG_USB_XHCI_MTK=y

+CONFIG_USB_MTU3=y

+CONFIG_USB_STORAGE=y

+CONFIG_USB_KEYBOARD=y

+CONFIG_USB_HOST_ETHER=y

+CONFIG_USB_GADGET=y

+CONFIG_USB_GADGET_VENDOR_NUM=0x0e8d

+CONFIG_USB_GADGET_PRODUCT_NUM=0x201c

+CONFIG_USB_ETHER=y

+CONFIG_WDT=y

+CONFIG_WDT_MTK=y

+CONFIG_OF_LIBFDT_OVERLAY=y

+CONFIG_LMB_MAX_REGIONS=16

-- 

2.25.1

From 6061bcfb8f1dfc47714beae179be4bc4e4223062 Mon Sep 17 00:00:00 2001

From: Rockefeller Lin <rockefeller.lin@innocomm.com>

Date: Fri, 7 Apr 2023 03:29:44 +0000

Subject: [PATCH] Set bootdelay to 0 to save ~2secs of booting time

Set bootdelay to 0 to save ~2secs of booting time

---

 configs/mt8365_sb35_defconfig        | 1 +

 1 files changed, 1 insertions(+)

diff --git a/configs/mt8365_sb35_defconfig b/configs/mt8365_sb35_defconfig

index 204b97244b..ccf8c26892 100644

--- a/configs/mt8365_sb35_defconfig

+++ b/configs/mt8365_sb35_defconfig

@@ -96,3 +96,4 @@ CONFIG_WDT=y

 CONFIG_WDT_MTK=y

 CONFIG_OF_LIBFDT_OVERLAY=y

 CONFIG_LMB_MAX_REGIONS=16

+CONFIG_BOOTDELAY=0

-- 

2.25.1

From 29ec664a6ac95151a2967527c1a9d04603aa62c3 Mon Sep 17 00:00:00 2001

From: Rockefeller Lin <rockefeller.lin@innocomm.com>

Date: Wed, 24 May 2023 12:57:31 +0800

Subject: [PATCH 1/1] Remove DPI and it66121 from sb35 dts

The HDMI bridge on SB35 EVK is lt9611 and interface is DSI, so remove

DPI and it66121 nodes.

The lt9611 node is added but disable it because MTK DSI is still not supported yet.

---

 arch/arm/dts/mt8365-sb35.dts | 66 +++++++++++++++++++-----------------

 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/arch/arm/dts/mt8365-sb35.dts b/arch/arm/dts/mt8365-sb35.dts

index 5f57657026..b645d276a6 100644

--- a/arch/arm/dts/mt8365-sb35.dts

+++ b/arch/arm/dts/mt8365-sb35.dts

@@ -84,14 +84,6 @@

 	status = "okay";

 };

-&dpi0 {

-	dpi_dual_edge;

-	pinctrl-names = "default", "sleep";

-	pinctrl-0 = <&dpi_pin_func>;

-	pinctrl-1 = <&dpi_pin_gpio>;

-	status = "okay";

-};

-

 &i2c0 {

 	pinctrl-names = "default";

 	pinctrl-0 = <&i2c0_pins_default>;

@@ -105,16 +97,15 @@

 	clock-frequency = <100000>;

 	status = "okay";

-	it66121hdmitx {

-		compatible = "ite,it66121";

+#if 0

+	lt9611hdmitx {

+		compatible = "lontium,lt9611";

 		reg = <0x4c>;

 		pinctrl-names = "default";

-		pinctrl-0 = <&ite_pins_default>;

-		vcn33-supply = <&mt6357_vcn33_bt_reg>;

-		vcn18-supply = <&mt6357_vcn18_reg>;

-		vrf12-supply = <&mt6357_vrf12_reg>;

-		reset-gpios = <&gpio 69 GPIO_ACTIVE_LOW>;

+		pinctrl-0 = <&hdmi_pins_default>;

+		reset-gpios = <&gpio 20 GPIO_ACTIVE_LOW>;

 	};

+#endif

 };

 &i2c2 {

@@ -125,16 +116,6 @@

 };

 &pio {

-	dpi_pin_func: dpi_pin_func {

-		function = "dpi";

-		groups =  "dpi_enable";

-	};

-

-	dpi_pin_gpio: dpi_pin_gpio {

-		function = "dpi";

-		groups =  "dpi_sleep";

-	};

-

 	i2c0_pins_default: i2c0_pins_default {

 		function = "i2c";

 		groups = "i2c0";

@@ -150,15 +131,38 @@

 		groups = "i2c2";

 	};

-	ite_pins_default: ite_pins_default {

-		pins_rst_ite {

-			pinmux = <MT8365_PIN_69_CMDAT1__FUNC_GPIO69>;

-			output-high;

+#if 0

+	hdmi_pins_default: hdmi_pins_default {

+		pin_pwr_en {

+			pinmux = <MT8365_PIN_4_GPIO4__FUNC_GPIO4>;

+			output-low;

 		};

-		pins_irq_ite {

-			pinmux = <MT8365_PIN_68_CMDAT0__FUNC_GPIO68>;

+		pin_lt9611_1v8_en {

+			pinmux = <MT8365_PIN_19_DISP_PWM__FUNC_GPIO19>;

+			output-low;

+		};

+

+		pin_lt9611_rst {

+			pinmux = <MT8365_PIN_20_LCM_RST__FUNC_GPIO20>;

+			output-low;

+		};

+

+		pin_lt9611_3v3_en {

+			pinmux = <MT8365_PIN_21_DSI_TE__FUNC_GPIO21>;

+			output-low;

+		};

+

+		pin_lt9611_intr {

+			pinmux = <MT8365_PIN_125_DMIC2_DAT1__FUNC_GPIO125>;

 			input-enable;

+			bias-pull-up;

+		};

+

+		pin_dsi_sel {

+			pinmux = <MT8365_PIN_2_GPIO2__FUNC_GPIO2>;

+			output-low;

 		};

 	};

+#endif

 };

-- 

2.25.1

	file://0001-Add-dedicated-sb35-defconfig-and-dts-files.patch \

	file://0002-Remove-DPI-and-it66121-from-sb35-dts.patch \

	file://0001-Set-bootdelay-to-0-to-save-2secs-of-booting-time.patch \

	file://rs232.dts \

	file://spidev.dts \

/dts-v1/;

/plugin/;

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/pinctrl/mt8365-pinfunc.h>

/ {

	fragment@0 {

		target = <&pio>;

		__overlay__ {

			rs232_pins: rs232-pins {

				pins_rx {

					pinmux = <MT8365_PIN_37_URXD1__FUNC_URXD1>;

					input-enable;

					bias-pull-up;

				};

				pins_tx_cts_rts {

					pinmux = <MT8365_PIN_38_UTXD1__FUNC_UTXD1>,

						<MT8365_PIN_39_URXD2__FUNC_UCTS1>,

						<MT8365_PIN_40_UTXD2__FUNC_URTS1>;

				};

				pins_rs232_shdn {

					pinmux = <MT8365_PIN_10_GPIO10__FUNC_GPIO10>;

					output-high;

				};

				pins_rs232_en {

					pinmux = <MT8365_PIN_8_GPIO8__FUNC_GPIO8>;

					output-high;

				};

			};

		};

	};

	fragment@1 {

		target = <&uart1>;

		__overlay__ {

			pinctrl-0 = <&rs232_pins>;

			pinctrl-names = "default";

			status = "okay";

		};

	};

};

/dts-v1/;

/plugin/;

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/pinctrl/mt8365-pinfunc.h>

/ {

	fragment@0 {

		target = <&pio>;

		__overlay__ {

			spi_pins: spi-pins {

                 pins {

                     pinmux =  <MT8365_PIN_9_GPIO9__FUNC_SPI_CSB>,

                              <MT8365_PIN_10_GPIO10__FUNC_SPI_MI>;

                     bias-disable;

                 };

                 out_pins {

                         pinmux = <MT8365_PIN_8_GPIO8__FUNC_SPI_CLK>,

                                  <MT8365_PIN_11_GPIO11__FUNC_SPI_MO>;

                         bias-disable;

                         drive-strength = <MTK_DRIVE_6mA>;

                };

          };

		};

	};

	fragment@1 {

		target = <&spi>;

		__overlay__ {

			pinctrl-0 = <&spi_pins>;

			pinctrl-names = "default";

			mediatek,pad-select = <0>;

			status = "okay";

			spidev@0 {

				compatible = "mediatek,aiot-board";

				spi-max-frequency = <50000000>;

				reg = <0>;

			};

		};

	};

};

diff -Naur a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c

--- a/drivers/gpu/drm/bridge/lontium-lt9611.c	2023-10-17 10:56:33.000000000 +0800

+++ b/drivers/gpu/drm/bridge/lontium-lt9611.c	2023-10-17 10:54:18.000000000 +0800

@@ -17,6 +17,7 @@

 #include <drm/drm_atomic_helper.h>

 #include <drm/drm_bridge.h>

 #include <drm/drm_mipi_dsi.h>

+#include <drm/drm_of.h>

 #include <drm/drm_print.h>

 #include <drm/drm_probe_helper.h>

@@ -31,7 +32,7 @@

 struct lt9611 {

 	struct device *dev;

 	struct drm_bridge bridge;

-	struct drm_connector connector;

+	struct drm_bridge *next_bridge;

 	struct regmap *regmap;

@@ -56,7 +57,6 @@

 	enum drm_connector_status status;

 	u8 edid_buf[EDID_SEG_SIZE];

-	u32 vic;

 };

 #define LT9611_PAGE_CONTROL	0xff

@@ -82,34 +82,11 @@

 	.num_ranges = ARRAY_SIZE(lt9611_ranges),

 };

-struct lt9611_mode {

-	u16 hdisplay;

-	u16 vdisplay;

-	u8 vrefresh;

-	u8 lanes;

-	u8 intfs;

-};

-

-static struct lt9611_mode lt9611_modes[] = {

-	{ 3840, 2160, 30, 4, 2 }, /* 3840x2160 24bit 30Hz 4Lane 2ports */

-	{ 1920, 1080, 60, 4, 1 }, /* 1080P 24bit 60Hz 4lane 1port */

-	{ 1920, 1080, 30, 3, 1 }, /* 1080P 24bit 30Hz 3lane 1port */

-	{ 1920, 1080, 24, 3, 1 },

-	{ 720, 480, 60, 4, 1 },

-	{ 720, 576, 50, 2, 1 },

-	{ 640, 480, 60, 2, 1 },

-};

-

 static struct lt9611 *bridge_to_lt9611(struct drm_bridge *bridge)

 {

 	return container_of(bridge, struct lt9611, bridge);

 }

-static struct lt9611 *connector_to_lt9611(struct drm_connector *connector)

-{

-	return container_of(connector, struct lt9611, connector);

-}

-

 static int lt9611_mipi_input_analog(struct lt9611 *lt9611)

 {

 	const struct reg_sequence reg_cfg[] = {

@@ -157,12 +134,12 @@

 	hactive = mode->hdisplay;

 	hsync_len = mode->hsync_end - mode->hsync_start;

 	hfront_porch = mode->hsync_start - mode->hdisplay;

-	hsync_porch = hsync_len + mode->htotal - mode->hsync_end;

+	hsync_porch = mode->htotal - mode->hsync_start;

 	vactive = mode->vdisplay;

 	vsync_len = mode->vsync_end - mode->vsync_start;

 	vfront_porch = mode->vsync_start - mode->vdisplay;

-	vsync_porch = vsync_len + mode->vtotal - mode->vsync_end;

+	vsync_porch = mode->vtotal - mode->vsync_start;

 	regmap_write(lt9611->regmap, 0x830d, (u8)(v_total / 256));

 	regmap_write(lt9611->regmap, 0x830e, (u8)(v_total % 256));

@@ -185,12 +162,14 @@

 	regmap_write(lt9611->regmap, 0x8319, (u8)(hfront_porch % 256));

-	regmap_write(lt9611->regmap, 0x831a, (u8)(hsync_porch / 256));

+	regmap_write(lt9611->regmap, 0x831a, (u8)(hsync_porch / 256) |

+						((hfront_porch / 256) << 4));

 	regmap_write(lt9611->regmap, 0x831b, (u8)(hsync_porch % 256));

 }

-static void lt9611_pcr_setup(struct lt9611 *lt9611, const struct drm_display_mode *mode)

+static void lt9611_pcr_setup(struct lt9611 *lt9611, const struct drm_display_mode *mode, unsigned int postdiv)

 {

+	unsigned int pcr_m = mode->clock * 5 * postdiv / 27000;

 	const struct reg_sequence reg_cfg[] = {

 		{ 0x830b, 0x01 },

 		{ 0x830c, 0x10 },

@@ -205,7 +184,6 @@

 		/* stage 2 */

 		{ 0x834a, 0x40 },

-		{ 0x831d, 0x10 },

 		/* MK limit */

 		{ 0x832d, 0x38 },

@@ -220,30 +198,28 @@

 		{ 0x8325, 0x00 },

 		{ 0x832a, 0x01 },

 		{ 0x834a, 0x10 },

-		{ 0x831d, 0x10 },

-		{ 0x8326, 0x37 },

 	};

+	u8 pol = 0x10;

-	regmap_multi_reg_write(lt9611->regmap, reg_cfg, ARRAY_SIZE(reg_cfg));

+	if (mode->flags & DRM_MODE_FLAG_NHSYNC)

+		pol |= 0x2;

+	if (mode->flags & DRM_MODE_FLAG_NVSYNC)

+		pol |= 0x1;

+	regmap_write(lt9611->regmap, 0x831d, pol);

-	switch (mode->hdisplay) {

-	case 640:

-		regmap_write(lt9611->regmap, 0x8326, 0x14);

-		break;

-	case 1920:

-		regmap_write(lt9611->regmap, 0x8326, 0x37);

-		break;

-	case 3840:

+	if (mode->hdisplay == 3840)

 		regmap_multi_reg_write(lt9611->regmap, reg_cfg2, ARRAY_SIZE(reg_cfg2));

-		break;

-	}

+	else

+		regmap_multi_reg_write(lt9611->regmap, reg_cfg, ARRAY_SIZE(reg_cfg));

+

+	regmap_write(lt9611->regmap, 0x8326, pcr_m);

 	/* pcr rst */

 	regmap_write(lt9611->regmap, 0x8011, 0x5a);

 	regmap_write(lt9611->regmap, 0x8011, 0xfa);

 }

-static int lt9611_pll_setup(struct lt9611 *lt9611, const struct drm_display_mode *mode)

+static int lt9611_pll_setup(struct lt9611 *lt9611, const struct drm_display_mode *mode, unsigned int *postdiv)

 {

 	unsigned int pclk = mode->clock;

 	const struct reg_sequence reg_cfg[] = {

@@ -257,16 +233,21 @@

 		{ 0x8126, 0x55 },

 		{ 0x8127, 0x66 },

 		{ 0x8128, 0x88 },

+		{ 0x812a, 0x20 },

 	};

 	regmap_multi_reg_write(lt9611->regmap, reg_cfg, ARRAY_SIZE(reg_cfg));

-	if (pclk > 150000)

+	if (pclk > 150000) {

 		regmap_write(lt9611->regmap, 0x812d, 0x88);

-	else if (pclk > 70000)

+		*postdiv = 1;

+	} else if (pclk > 70000) {

 		regmap_write(lt9611->regmap, 0x812d, 0x99);

-	else

+		*postdiv = 2;

+	} else {

 		regmap_write(lt9611->regmap, 0x812d, 0xaa);

+		*postdiv = 4;

+	}

 	/*

 	 * first divide pclk by 2 first

@@ -351,12 +332,51 @@

 	return temp;

 }

+static void lt9611_hdmi_set_infoframes(struct lt9611 *lt9611,

+				       struct drm_connector *connector,

+				       struct drm_display_mode *mode)

+{

+	union hdmi_infoframe infoframe;

+	ssize_t len;

+	u8 iframes = 0x0a; /* UD1 infoframe */

+	u8 buf[32];

+	int ret;

+	int i;

+

+	ret = drm_hdmi_avi_infoframe_from_display_mode(&infoframe.avi,

+						       connector,

+						       mode);

+	if (ret < 0)

+		goto out;

+

+	len = hdmi_infoframe_pack(&infoframe, buf, sizeof(buf));

+	if (len < 0)

+		goto out;

+

+	for (i = 0; i < len; i++)

+		regmap_write(lt9611->regmap, 0x8440 + i, buf[i]);

+

+	ret = drm_hdmi_vendor_infoframe_from_display_mode(&infoframe.vendor.hdmi,

+							  connector,

+							  mode);

+	if (ret < 0)

+		goto out;

+

+	len = hdmi_infoframe_pack(&infoframe, buf, sizeof(buf));

+	if (len < 0)

+		goto out;

+

+	for (i = 0; i < len; i++)

+		regmap_write(lt9611->regmap, 0x8474 + i, buf[i]);

+

+	iframes |= 0x20;

+

+out:

+	regmap_write(lt9611->regmap, 0x843d, iframes); /* UD1 infoframe */

+}

+

 static void lt9611_hdmi_tx_digital(struct lt9611 *lt9611)

 {

-	regmap_write(lt9611->regmap, 0x8443, 0x46 - lt9611->vic);

-	regmap_write(lt9611->regmap, 0x8447, lt9611->vic);

-	regmap_write(lt9611->regmap, 0x843d, 0x0a); /* UD1 infoframe */

-

 	regmap_write(lt9611->regmap, 0x82d6, 0x8c);

 	regmap_write(lt9611->regmap, 0x82d7, 0x04);

 }

@@ -446,12 +466,11 @@

 		{ 0x8023, 0x01 },

 		{ 0x8157, 0x03 }, /* set addr pin as output */

 		{ 0x8149, 0x0b },

-		{ 0x8151, 0x30 }, /* disable IRQ */

+

 		{ 0x8102, 0x48 }, /* MIPI Rx power down */

 		{ 0x8123, 0x80 },

 		{ 0x8130, 0x00 },

-		{ 0x8100, 0x01 }, /* bandgap power down */

-		{ 0x8101, 0x00 }, /* system clk power down */

+		{ 0x8011, 0x0a },

 	};

 	regmap_multi_reg_write(lt9611->regmap,

@@ -517,7 +536,7 @@

 	msleep(20);

 	gpiod_set_value_cansleep(lt9611->reset_gpio, 1);

-	msleep(100);

+	msleep(20);

 }

 static void lt9611_assert_5v(struct lt9611 *lt9611)

@@ -562,31 +581,14 @@

 	return 0;

 }

-static struct lt9611_mode *lt9611_find_mode(const struct drm_display_mode *mode)

-{

-	int i;

-

-	for (i = 0; i < ARRAY_SIZE(lt9611_modes); i++) {

-		if (lt9611_modes[i].hdisplay == mode->hdisplay &&

-		    lt9611_modes[i].vdisplay == mode->vdisplay &&

-		    lt9611_modes[i].vrefresh == drm_mode_vrefresh(mode)) {

-			return &lt9611_modes[i];

-		}

-	}

-

-	return NULL;

-}

-

-/* connector funcs */

-static enum drm_connector_status

-lt9611_connector_detect(struct drm_connector *connector, bool force)

+static enum drm_connector_status lt9611_bridge_detect(struct drm_bridge *bridge)

 {

-	struct lt9611 *lt9611 = connector_to_lt9611(connector);

+	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

 	unsigned int reg_val = 0;

 	int connected = 0;

 	regmap_read(lt9611->regmap, 0x825e, &reg_val);

-	connected  = (reg_val & BIT(2));

+	connected  = (reg_val & (BIT(2) | BIT(0)));

 	lt9611->status = connected ?  connector_status_connected :

 				connector_status_disconnected;

@@ -675,34 +677,37 @@

 	return 0;

 }

-static int lt9611_connector_get_modes(struct drm_connector *connector)

+/* bridge funcs */

+static void

+lt9611_bridge_atomic_enable(struct drm_bridge *bridge,

+			    struct drm_bridge_state *old_bridge_state)

 {

-	struct lt9611 *lt9611 = connector_to_lt9611(connector);

-	unsigned int count;

-	struct edid *edid;

+	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

+	struct drm_atomic_state *state = old_bridge_state->base.state;

+	struct drm_connector *connector;

+	struct drm_connector_state *conn_state;

+	struct drm_crtc_state *crtc_state;

+	struct drm_display_mode *mode;

+	unsigned int postdiv;

-	lt9611_power_on(lt9611);

-	edid = drm_do_get_edid(connector, lt9611_get_edid_block, lt9611);

-	drm_connector_update_edid_property(connector, edid);

-	count = drm_add_edid_modes(connector, edid);

-	kfree(edid);

+	connector = drm_atomic_get_new_connector_for_encoder(state, bridge->encoder);

+	if (WARN_ON(!connector))

+		return;

-	return count;

-}

+	conn_state = drm_atomic_get_new_connector_state(state, connector);

+	if (WARN_ON(!conn_state))

+		return;

-static enum drm_mode_status

-lt9611_connector_mode_valid(struct drm_connector *connector,

-			    struct drm_display_mode *mode)

-{

-	struct lt9611_mode *lt9611_mode = lt9611_find_mode(mode);

+	crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc);

+	if (WARN_ON(!crtc_state))

+		return;

-	return lt9611_mode ? MODE_OK : MODE_BAD;

-}

+	mode = &crtc_state->adjusted_mode;

-/* bridge funcs */

-static void lt9611_bridge_enable(struct drm_bridge *bridge)

-{

-	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

+	lt9611_mipi_input_digital(lt9611, mode);

+	lt9611_pll_setup(lt9611, mode, &postdiv);

+	lt9611_mipi_video_setup(lt9611, mode);

+	lt9611_pcr_setup(lt9611, mode, postdiv);

 	if (lt9611_power_on(lt9611)) {

 		dev_err(lt9611->dev, "power on failed\n");

@@ -710,10 +715,11 @@

 	}

 	lt9611_mipi_input_analog(lt9611);

+	lt9611_hdmi_set_infoframes(lt9611, connector, mode);

 	lt9611_hdmi_tx_digital(lt9611);

 	lt9611_hdmi_tx_phy(lt9611);

-	msleep(500);

+	//msleep(500);

 	lt9611_video_check(lt9611);

@@ -721,7 +727,9 @@

 	regmap_write(lt9611->regmap, 0x8130, 0xea);

 }

-static void lt9611_bridge_disable(struct drm_bridge *bridge)

+static void

+lt9611_bridge_atomic_disable(struct drm_bridge *bridge,

+			     struct drm_bridge_state *old_bridge_state)

 {

 	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

 	int ret;

@@ -739,25 +747,10 @@

 	}

 }

-static struct

-drm_connector_helper_funcs lt9611_bridge_connector_helper_funcs = {

-	.get_modes = lt9611_connector_get_modes,

-	.mode_valid = lt9611_connector_mode_valid,

-};

-

-static const struct drm_connector_funcs lt9611_bridge_connector_funcs = {

-	.fill_modes = drm_helper_probe_single_connector_modes,

-	.detect = lt9611_connector_detect,

-	.destroy = drm_connector_cleanup,

-	.reset = drm_atomic_helper_connector_reset,

-	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

-	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

-};

-

 static struct mipi_dsi_device *lt9611_attach_dsi(struct lt9611 *lt9611,

 						 struct device_node *dsi_node)

 {

-	const struct mipi_dsi_device_info info = { "lt9611", 0, NULL };

+	const struct mipi_dsi_device_info info = { "lt9611", 0, lt9611->dev->of_node};

 	struct mipi_dsi_device *dsi;

 	struct mipi_dsi_host *host;

 	int ret;

@@ -802,42 +795,12 @@

 	mipi_dsi_device_unregister(lt9611->dsi0);

 }

-static int lt9611_connector_init(struct drm_bridge *bridge, struct lt9611 *lt9611)

-{

-	int ret;

-

-	ret = drm_connector_init(bridge->dev, &lt9611->connector,

-				 &lt9611_bridge_connector_funcs,

-				 DRM_MODE_CONNECTOR_HDMIA);

-	if (ret) {

-		DRM_ERROR("Failed to initialize connector with drm\n");

-		return ret;

-	}

-

-	drm_connector_helper_add(&lt9611->connector,

-				 &lt9611_bridge_connector_helper_funcs);

-	drm_connector_attach_encoder(&lt9611->connector, bridge->encoder);

-

-	if (!bridge->encoder) {

-		DRM_ERROR("Parent encoder object not found");

-		return -ENODEV;

-	}

-

-	return 0;

-}

-

 static int lt9611_bridge_attach(struct drm_bridge *bridge,

 				enum drm_bridge_attach_flags flags)

 {

 	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

 	int ret;

-	if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) {

-		ret = lt9611_connector_init(bridge, lt9611);

-		if (ret < 0)

-			return ret;

-	}

-

 	/* Attach primary DSI */

 	lt9611->dsi0 = lt9611_attach_dsi(lt9611, lt9611->dsi0_node);

 	if (IS_ERR(lt9611->dsi0))

@@ -852,11 +815,11 @@

 		}

 	}

-	return 0;

+	return drm_bridge_attach(bridge->encoder, lt9611->next_bridge,

+				 bridge, flags);

 err_unregister_dsi0:

 	lt9611_bridge_detach(bridge);

-	drm_connector_cleanup(&lt9611->connector);

 	mipi_dsi_device_unregister(lt9611->dsi0);

 	return ret;

@@ -866,74 +829,54 @@

 						     const struct drm_display_info *info,

 						     const struct drm_display_mode *mode)

 {

-	struct lt9611_mode *lt9611_mode = lt9611_find_mode(mode);

 	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

-	if (!lt9611_mode)

-		return MODE_BAD;

-	else if (lt9611_mode->intfs > 1 && !lt9611->dsi1)

+	if (mode->hdisplay > 3840)

+		return MODE_BAD_HVALUE;

+

+	if (mode->vdisplay > 2160)

+		return MODE_BAD_VVALUE;

+

+	if (mode->hdisplay == 3840 &&

+	    mode->vdisplay == 2160 &&

+	    drm_mode_vrefresh(mode) > 30)

+		return MODE_CLOCK_HIGH;

+

+	if (mode->hdisplay > 2000 && !lt9611->dsi1_node)

 		return MODE_PANEL;

 	else

 		return MODE_OK;

 }

-static void lt9611_bridge_pre_enable(struct drm_bridge *bridge)

+static void lt9611_bridge_atomic_pre_enable(struct drm_bridge *bridge,

+					    struct drm_bridge_state *old_bridge_state)

 {

 	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

+	static const struct reg_sequence reg_cfg[] = {

+		{ 0x8102, 0x12 },

+		{ 0x8123, 0x40 },

+		{ 0x8130, 0xea },

+		{ 0x8011, 0xfa },

+	};

 	if (!lt9611->sleep)

 		return;

-	lt9611_reset(lt9611);

-	regmap_write(lt9611->regmap, 0x80ee, 0x01);

+	regmap_multi_reg_write(lt9611->regmap,

+			       reg_cfg, ARRAY_SIZE(reg_cfg));

 	lt9611->sleep = false;

 }

-static void lt9611_bridge_post_disable(struct drm_bridge *bridge)

+static void

+lt9611_bridge_atomic_post_disable(struct drm_bridge *bridge,

+				  struct drm_bridge_state *old_bridge_state)

 {

 	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

 	lt9611_sleep_setup(lt9611);

 }

-static void lt9611_bridge_mode_set(struct drm_bridge *bridge,

-				   const struct drm_display_mode *mode,

-				   const struct drm_display_mode *adj_mode)

-{

-	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

-	struct hdmi_avi_infoframe avi_frame;

-	int ret;

-

-	lt9611_bridge_pre_enable(bridge);

-

-	lt9611_mipi_input_digital(lt9611, mode);

-	lt9611_pll_setup(lt9611, mode);

-	lt9611_mipi_video_setup(lt9611, mode);

-	lt9611_pcr_setup(lt9611, mode);

-

-	ret = drm_hdmi_avi_infoframe_from_display_mode(&avi_frame,

-						       &lt9611->connector,

-						       mode);

-	if (!ret)

-		lt9611->vic = avi_frame.video_code;

-}

-

-static enum drm_connector_status lt9611_bridge_detect(struct drm_bridge *bridge)

-{

-	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

-	unsigned int reg_val = 0;

-	int connected;

-

-	regmap_read(lt9611->regmap, 0x825e, &reg_val);

-	connected  = reg_val & BIT(2);

-

-	lt9611->status = connected ?  connector_status_connected :

-				connector_status_disconnected;

-

-	return lt9611->status;

-}

-

 static struct edid *lt9611_bridge_get_edid(struct drm_bridge *bridge,

 					   struct drm_connector *connector)

 {

@@ -954,13 +897,17 @@

 	.attach = lt9611_bridge_attach,

 	.detach = lt9611_bridge_detach,

 	.mode_valid = lt9611_bridge_mode_valid,

-	.enable = lt9611_bridge_enable,

-	.disable = lt9611_bridge_disable,

-	.post_disable = lt9611_bridge_post_disable,

-	.mode_set = lt9611_bridge_mode_set,

 	.detect = lt9611_bridge_detect,

 	.get_edid = lt9611_bridge_get_edid,

 	.hpd_enable = lt9611_bridge_hpd_enable,

+

+	.atomic_pre_enable = lt9611_bridge_atomic_pre_enable,

+	.atomic_enable = lt9611_bridge_atomic_enable,

+	.atomic_disable = lt9611_bridge_atomic_disable,

+	.atomic_post_disable = lt9611_bridge_atomic_post_disable,

+	.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,

+	.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,

+	.atomic_reset = drm_atomic_helper_bridge_reset,

 };

 static int lt9611_parse_dt(struct device *dev,

@@ -976,7 +923,7 @@

 	lt9611->ac_mode = of_property_read_bool(dev->of_node, "lt,ac-mode");

-	return 0;

+	return drm_of_find_panel_or_bridge(dev->of_node, 2, -1, NULL, &lt9611->next_bridge);

 }

 static int lt9611_gpio_init(struct lt9611 *lt9611)

diff -Naur a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c

--- a/drivers/gpu/drm/mediatek/mtk_dsi.c	2023-10-17 10:56:34.000000000 +0800

+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c	2023-10-18 10:53:22.268074700 +0800

@@ -793,58 +793,6 @@

 	mtk_dsi_poweroff(dsi);

 }

-static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi)

-{

-	int ret;

-	int indicated_disp_path = -1;

-

-	ret = drm_simple_encoder_init(drm, &dsi->encoder,

-				      DRM_MODE_ENCODER_DSI);

-	if (ret) {

-		DRM_ERROR("Failed to encoder init to drm\n");

-		return ret;

-	}

-

-	if (of_find_property(dsi->host.dev->of_node, "mediatek,indicated-display-path", &ret)) {

-		ret = of_property_read_u32(dsi->host.dev->of_node,

-					   "mediatek,indicated-display-path",

-					   &indicated_disp_path);

-		if (ret) {

-			dev_err(dsi->host.dev, "Failed to get indicated-display-path id\n");

-			return ret;

-		}

-		if (indicated_disp_path < 0 || indicated_disp_path >= MAX_CRTC) {

-			dev_err(dsi->host.dev, "Wrong indicated-display-path id read from dts !\n");

-			indicated_disp_path = -1;

-		}

-	}

-

-	if (indicated_disp_path == -1)

-		dsi->encoder.possible_crtcs =

-			mtk_drm_find_possible_crtc_by_comp(drm, dsi->host.dev);

-	else

-		dsi->encoder.possible_crtcs = (1 << indicated_disp_path);

-

-	ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL,

-				DRM_BRIDGE_ATTACH_NO_CONNECTOR);

-	if (ret)

-		goto err_cleanup_encoder;

-

-	dsi->connector = drm_bridge_connector_init(drm, &dsi->encoder);

-	if (IS_ERR(dsi->connector)) {

-		DRM_ERROR("Unable to create bridge connector\n");

-		ret = PTR_ERR(dsi->connector);

-		goto err_cleanup_encoder;

-	}

-	drm_connector_attach_encoder(dsi->connector, &dsi->encoder);

-

-	return 0;

-

-err_cleanup_encoder:

-	drm_encoder_cleanup(&dsi->encoder);

-	return ret;

-}

-

 int mtk_dsi_encoder_index(struct device *dev)

 {

 	struct mtk_dsi *dsi = dev_get_drvdata(dev);

@@ -854,72 +802,18 @@

 	return encoder_index;

 }

-static int mtk_dsi_bind(struct device *dev, struct device *master, void *data)

-{

-	int ret;

-	struct drm_device *drm = data;

-	struct mtk_dsi *dsi = dev_get_drvdata(dev);

-	if (!dsi->next_bridge)

-		return 0;

-

-	ret = mtk_dsi_encoder_init(drm, dsi);

-	if (ret)

-		return ret;

-

-	return device_reset_optional(dev);

-}

-

-static void mtk_dsi_unbind(struct device *dev, struct device *master,

-			   void *data)

-{

-	struct mtk_dsi *dsi = dev_get_drvdata(dev);

-	if (!dsi->next_bridge)

-		return;

-

-	drm_encoder_cleanup(&dsi->encoder);

-}

-

-static const struct component_ops mtk_dsi_component_ops = {

-	.bind = mtk_dsi_bind,

-	.unbind = mtk_dsi_unbind,

-};

-

 static int mtk_dsi_host_attach(struct mipi_dsi_host *host,

 			       struct mipi_dsi_device *device)

 {

 	struct mtk_dsi *dsi = host_to_dsi(host);

-	struct device *dev = host->dev;

-	int ret;

 	dsi->lanes = device->lanes;

 	dsi->format = device->format;

 	dsi->mode_flags = device->mode_flags;

-	dsi->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);

-	if (IS_ERR(dsi->next_bridge))

-		return PTR_ERR(dsi->next_bridge);

-

-	drm_bridge_add(&dsi->bridge);

-

-	ret = component_add(host->dev, &mtk_dsi_component_ops);

-	if (ret) {

-		DRM_ERROR("failed to add dsi_host component: %d\n", ret);

-		drm_bridge_remove(&dsi->bridge);

-		return ret;

-	}

 	return 0;

 }

-static int mtk_dsi_host_detach(struct mipi_dsi_host *host,

-			       struct mipi_dsi_device *device)

-{

-	struct mtk_dsi *dsi = host_to_dsi(host);

-

-	component_del(host->dev, &mtk_dsi_component_ops);

-	drm_bridge_remove(&dsi->bridge);

-	return 0;

-}

-

 static void mtk_dsi_wait_for_idle(struct mtk_dsi *dsi)

 {

 	int ret;

@@ -1075,14 +969,73 @@

 static const struct mipi_dsi_host_ops mtk_dsi_ops = {

 	.attach = mtk_dsi_host_attach,

-	.detach = mtk_dsi_host_detach,

 	.transfer = mtk_dsi_host_transfer,

 };

+static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi)

+{

+	int ret;

+

+	ret = drm_simple_encoder_init(drm, &dsi->encoder,

+				      DRM_MODE_ENCODER_DSI);

+	if (ret) {

+		DRM_ERROR("Failed to encoder init to drm\n");

+		return ret;

+	}

+

+	dsi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm, dsi->host.dev);

+

+	ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL,

+				DRM_BRIDGE_ATTACH_NO_CONNECTOR);

+	if (ret)

+		goto err_cleanup_encoder;

+

+	dsi->connector = drm_bridge_connector_init(drm, &dsi->encoder);

+	if (IS_ERR(dsi->connector)) {

+		DRM_ERROR("Unable to create bridge connector\n");

+		ret = PTR_ERR(dsi->connector);

+		goto err_cleanup_encoder;

+	}

+	drm_connector_attach_encoder(dsi->connector, &dsi->encoder);

+

+	return 0;

+

+err_cleanup_encoder:

+	drm_encoder_cleanup(&dsi->encoder);

+	return ret;

+}

+

+static int mtk_dsi_bind(struct device *dev, struct device *master, void *data)

+{

+	int ret;

+	struct drm_device *drm = data;

+	struct mtk_dsi *dsi = dev_get_drvdata(dev);

+

+	ret = mtk_dsi_encoder_init(drm, dsi);

+	if (ret)

+		return ret;

+

+	return device_reset_optional(dev);

+}

+

+static void mtk_dsi_unbind(struct device *dev, struct device *master,

+			   void *data)

+{

+	struct mtk_dsi *dsi = dev_get_drvdata(dev);

+

+	drm_encoder_cleanup(&dsi->encoder);

+}

+

+static const struct component_ops mtk_dsi_component_ops = {

+	.bind = mtk_dsi_bind,

+	.unbind = mtk_dsi_unbind,

+};

+

 static int mtk_dsi_probe(struct platform_device *pdev)

 {

 	struct mtk_dsi *dsi;

 	struct device *dev = &pdev->dev;

+	struct drm_panel *panel;

 	struct resource *regs;

 	int irq_num;

 	int ret;

@@ -1099,6 +1052,12 @@

 		return ret;

 	}

+	dsi->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);

+	if (IS_ERR(dsi->next_bridge)) {

+		ret = PTR_ERR(dsi->next_bridge);

+		goto err_unregister_host;

+	}

+

 	dsi->driver_data = of_device_get_match_data(dev);

 	dsi->poweron_in_hs_mode = 1;

@@ -1167,24 +1126,12 @@

 	dsi->bridge.of_node = dev->of_node;

 	dsi->bridge.type = DRM_MODE_CONNECTOR_DSI;

+	drm_bridge_add(&dsi->bridge);

-	dsi->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);

-	if (IS_ERR(dsi->next_bridge) && PTR_ERR(dsi->next_bridge) == -ENODEV) {

-		/* if no panel has been connected in the device tree on purpose,

-		 * add the component directly here with empty ops as the

-		 * unction doing this will never be called. But first warn

-		 * about this.

-		 */

-		dev_warn(dev, "No panel connected in the devicetree, continuing without any panel...\n");

-		dsi->next_bridge = NULL;

-		drm_bridge_add(&dsi->bridge);

-

-		ret = component_add(&pdev->dev, &mtk_dsi_component_ops);

-		if (ret) {

-			DRM_ERROR("failed to add dsi_host component: %d\n", ret);

-			drm_bridge_remove(&dsi->bridge);

-			return ret;

-		}

+	ret = component_add(&pdev->dev, &mtk_dsi_component_ops);

+	if (ret) {

+		dev_err(&pdev->dev, "failed to add component: %d\n", ret);

+		goto err_unregister_host;

 	}

 	return 0;

@@ -1199,6 +1146,8 @@

 	struct mtk_dsi *dsi = platform_get_drvdata(pdev);

 	mtk_output_dsi_disable(dsi);

+	drm_bridge_remove(&dsi->bridge);

+	component_del(&pdev->dev, &mtk_dsi_component_ops);

 	mipi_dsi_host_unregister(&dsi->host);

 	return 0;

diff -Naur a/drivers/gpu/drm/panel/panel-rpi-pumpkin-touchscreen.c b/drivers/gpu/drm/panel/panel-rpi-pumpkin-touchscreen.c

--- a/drivers/gpu/drm/panel/panel-rpi-pumpkin-touchscreen.c	2023-10-17 10:56:35.000000000 +0800

+++ b/drivers/gpu/drm/panel/panel-rpi-pumpkin-touchscreen.c	2023-10-18 15:12:15.691960000 +0800

@@ -527,8 +527,8 @@

 static int __init rpi_touchscreen_init(void)

 {

-	mipi_dsi_driver_register(&rpi_touchscreen_dsi_driver);

-	return i2c_add_driver(&rpi_touchscreen_driver);