From 5046f8b005a59cdf7adfaa5d059cef003e4bd9e2 Mon Sep 17 00:00:00 2001
From: Dmitry Rakhchev <rda@emcraft.com>
Date: Wed, 25 Mar 2026 19:42:16 +0300
Subject: [PATCH 1/5] regulator/rpi-panel-attiny: update from official RPi
 kernel

branch rpi-6.12.y, 848280fcccd1a60eef407e2fcce6ace851b23d82
---
 .../regulator/rpi-panel-attiny-regulator.c    | 77 +++----------------
 1 file changed, 10 insertions(+), 67 deletions(-)

diff --git a/drivers/regulator/rpi-panel-attiny-regulator.c b/drivers/regulator/rpi-panel-attiny-regulator.c
index 6c3b6bfac961d..a1ac963dfe5d0 100644
--- a/drivers/regulator/rpi-panel-attiny-regulator.c
+++ b/drivers/regulator/rpi-panel-attiny-regulator.c
@@ -143,24 +143,8 @@ static int attiny_lcd_power_disable(struct regulator_dev *rdev)
 static int attiny_lcd_power_is_enabled(struct regulator_dev *rdev)
 {
 	struct attiny_lcd *state = rdev_get_drvdata(rdev);
-	unsigned int data;
-	int ret, i;
-
-	mutex_lock(&state->lock);
 
-	for (i = 0; i < 10; i++) {
-		ret = regmap_read(rdev->regmap, REG_PORTC, &data);
-		if (!ret)
-			break;
-		usleep_range(10000, 12000);
-	}
-
-	mutex_unlock(&state->lock);
-
-	if (ret < 0)
-		return ret;
-
-	return data & PC_RST_BRIDGE_N;
+	return state->port_states[REG_PORTC - REG_PORTA] & PC_RST_BRIDGE_N;
 }
 
 static const struct regulator_init_data attiny_regulator_default = {
@@ -245,39 +229,6 @@ static void attiny_gpio_set(struct gpio_chip *gc, unsigned int off, int val)
 	mutex_unlock(&state->lock);
 }
 
-static int attiny_i2c_read(struct i2c_client *client, u8 reg, unsigned int *buf)
-{
-	struct i2c_msg msgs[1];
-	u8 addr_buf[1] = { reg };
-	u8 data_buf[1] = { 0, };
-	int ret;
-
-	/* Write register address */
-	msgs[0].addr = client->addr;
-	msgs[0].flags = 0;
-	msgs[0].len = ARRAY_SIZE(addr_buf);
-	msgs[0].buf = addr_buf;
-
-	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-	if (ret != ARRAY_SIZE(msgs))
-		return -EIO;
-
-	usleep_range(5000, 10000);
-
-	/* Read data from register */
-	msgs[0].addr = client->addr;
-	msgs[0].flags = I2C_M_RD;
-	msgs[0].len = 1;
-	msgs[0].buf = data_buf;
-
-	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-	if (ret != ARRAY_SIZE(msgs))
-		return -EIO;
-
-	*buf = data_buf[0];
-	return 0;
-}
-
 /*
  * I2C driver interface functions
  */
@@ -289,7 +240,6 @@ static int attiny_i2c_probe(struct i2c_client *i2c)
 	struct regulator_dev *rdev;
 	struct attiny_lcd *state;
 	struct regmap *regmap;
-	unsigned int data;
 	int ret;
 
 	state = devm_kzalloc(&i2c->dev, sizeof(*state), GFP_KERNEL);
@@ -307,22 +257,6 @@ static int attiny_i2c_probe(struct i2c_client *i2c)
 		goto error;
 	}
 
-	ret = attiny_i2c_read(i2c, REG_ID, &data);
-	if (ret < 0) {
-		dev_err(&i2c->dev, "Failed to read REG_ID reg: %d\n", ret);
-		goto error;
-	}
-
-	switch (data) {
-	case 0xde: /* ver 1 */
-	case 0xc3: /* ver 2 */
-		break;
-	default:
-		dev_err(&i2c->dev, "Unknown Atmel firmware revision: 0x%02x\n", data);
-		ret = -ENODEV;
-		goto error;
-	}
-
 	regmap_write(regmap, REG_POWERON, 0);
 	msleep(30);
 	regmap_write(regmap, REG_PWM, 0);
@@ -386,6 +320,14 @@ static void attiny_i2c_remove(struct i2c_client *client)
 	mutex_destroy(&state->lock);
 }
 
+static void attiny_i2c_shutdown(struct i2c_client *client)
+{
+	struct attiny_lcd *state = i2c_get_clientdata(client);
+
+	regmap_write(state->regmap, REG_PWM, 0);
+	regmap_write(state->regmap, REG_POWERON, 0);
+}
+
 static const struct of_device_id attiny_dt_ids[] = {
 	{ .compatible = "raspberrypi,7inch-touchscreen-panel-regulator" },
 	{},
@@ -400,6 +342,7 @@ static struct i2c_driver attiny_regulator_driver = {
 	},
 	.probe = attiny_i2c_probe,
 	.remove	= attiny_i2c_remove,
+	.shutdown = attiny_i2c_shutdown,
 };
 
 module_i2c_driver(attiny_regulator_driver);

From c21cd479a3211ff06c805f71dc87b84883eaf887 Mon Sep 17 00:00:00 2001
From: Dmitry Rakhchev <rda@emcraft.com>
Date: Wed, 25 Mar 2026 19:45:55 +0300
Subject: [PATCH 2/5] fbdev/mxc/mxcfb_rpi_7inch: add RPi 7inch panel

---
 drivers/video/fbdev/mxc/Kconfig              |   4 +
 drivers/video/fbdev/mxc/Makefile             |   1 +
 drivers/video/fbdev/mxc/mipi_dsi.h           |   5 +
 drivers/video/fbdev/mxc/mipi_dsi_northwest.c |   6 +
 drivers/video/fbdev/mxc/mxcfb_rpi_7inch.c    | 256 +++++++++++++++++++
 5 files changed, 272 insertions(+)
 create mode 100644 drivers/video/fbdev/mxc/mxcfb_rpi_7inch.c

diff --git a/drivers/video/fbdev/mxc/Kconfig b/drivers/video/fbdev/mxc/Kconfig
index d8896a0513d84..329d222494f4d 100644
--- a/drivers/video/fbdev/mxc/Kconfig
+++ b/drivers/video/fbdev/mxc/Kconfig
@@ -130,3 +130,7 @@ config FB_MXC_DCIC
 	depends on FB_MXC_SYNC_PANEL
 	depends on MXC_IPU_V3 || FB_MXS
 	select VIDEOMODE_HELPERS
+
+config FB_MXC_RPI_7INCH_LCD
+	depends on I2C
+	tristate "Raspberry Pi 7 inch LCD"
diff --git a/drivers/video/fbdev/mxc/Makefile b/drivers/video/fbdev/mxc/Makefile
index 0cb0925a5282a..6ad13155fa0d0 100644
--- a/drivers/video/fbdev/mxc/Makefile
+++ b/drivers/video/fbdev/mxc/Makefile
@@ -1,3 +1,4 @@
+obj-$(CONFIG_FB_MXC_RPI_7INCH_LCD)		+= mxcfb_rpi_7inch.o
 obj-$(CONFIG_FB_MXC_DISP_FRAMEWORK)             += mxc_dispdrv.o
 obj-$(CONFIG_FB_MXC_MIPI_DSI_NORTHWEST)         += mipi_dsi_northwest.o
 obj-$(CONFIG_FB_MXC_EDID)                       += mxc_edid.o
diff --git a/drivers/video/fbdev/mxc/mipi_dsi.h b/drivers/video/fbdev/mxc/mipi_dsi.h
index b8fc12cd60054..d19edd85a57a4 100644
--- a/drivers/video/fbdev/mxc/mipi_dsi.h
+++ b/drivers/video/fbdev/mxc/mipi_dsi.h
@@ -187,5 +187,10 @@ void mipid_hx8394_get_lcd_videomode(struct fb_videomode **mode, int *size,
                                      struct mipi_lcd_config **data);
 int mipid_hx8394_lcd_setup(struct mipi_dsi_info *mipi_dsi);
 #endif
+#ifdef CONFIG_FB_MXC_RPI_7INCH_LCD
+void mipid_rpi_get_lcd_videomode(struct fb_videomode **mode, int *size,
+                                     struct mipi_lcd_config **data);
+int mipid_rpi_lcd_setup(struct mipi_dsi_info *mipi_dsi);
+#endif
 
 #endif
diff --git a/drivers/video/fbdev/mxc/mipi_dsi_northwest.c b/drivers/video/fbdev/mxc/mipi_dsi_northwest.c
index c33157a860779..066b8ad39b1fe 100644
--- a/drivers/video/fbdev/mxc/mipi_dsi_northwest.c
+++ b/drivers/video/fbdev/mxc/mipi_dsi_northwest.c
@@ -94,6 +94,12 @@ static struct mipi_dsi_match_lcd mipi_dsi_lcd_db[] = {
 	 "ROCKTECH-RK055AHD091",
 	 {mipid_hx8394_get_lcd_videomode, mipid_hx8394_lcd_setup}
 	},
+#endif
+#ifdef CONFIG_FB_MXC_RPI_7INCH_LCD
+	{
+	 "RPI-7INCH-LCD",
+	 {mipid_rpi_get_lcd_videomode, mipid_rpi_lcd_setup}
+	},
 #endif
 	{
 	"", {NULL, NULL}
diff --git a/drivers/video/fbdev/mxc/mxcfb_rpi_7inch.c b/drivers/video/fbdev/mxc/mxcfb_rpi_7inch.c
new file mode 100644
index 0000000000000..fdcbf376c5618
--- /dev/null
+++ b/drivers/video/fbdev/mxc/mxcfb_rpi_7inch.c
@@ -0,0 +1,256 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright(C) 2024-2026 Emcraft Systems
+ * Author(s): Vladimir Skvortsov <vskvortsov@emcraft.com>
+ */
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+#include <linux/mipi_dsi.h>
+#include <video/mipi_display.h>
+
+#include "mipi_dsi.h"
+
+#define RPI_DSI_DRIVER_NAME "rpi-ts-dsi"
+
+/* PPI layer registers */
+#define PPI_STARTPPI		0x0104 /* START control bit */
+#define PPI_LPTXTIMECNT		0x0114 /* LPTX timing signal */
+#define PPI_D0S_ATMR		0x0144
+#define PPI_D1S_ATMR		0x0148
+#define PPI_D0S_CLRSIPOCOUNT	0x0164 /* Assertion timer for Lane 0 */
+#define PPI_D1S_CLRSIPOCOUNT	0x0168 /* Assertion timer for Lane 1 */
+#define PPI_START_FUNCTION	1
+
+/* DSI layer registers */
+#define DSI_STARTDSI		0x0204 /* START control bit of DSI-TX */
+#define DSI_LANEENABLE		0x0210 /* Enables each lane */
+#define DSI_RX_START		1
+
+/* LCDC/DPI Host Registers, based on guesswork that this matches TC358764 */
+#define LCDCTRL			0x0420 /* Video Path Control */
+#define LCDCTRL_MSF		BIT(0) /* Magic square in RGB666 */
+#define LCDCTRL_VTGEN		BIT(4)/* Use chip clock for timing */
+#define LCDCTRL_UNK6		BIT(6) /* Unknown */
+#define LCDCTRL_EVTMODE		BIT(5) /* Event mode */
+#define LCDCTRL_RGB888		BIT(8) /* RGB888 mode */
+#define LCDCTRL_HSPOL		BIT(17) /* Polarity of HSYNC signal */
+#define LCDCTRL_DEPOL		BIT(18) /* Polarity of DE signal */
+#define LCDCTRL_VSPOL		BIT(19) /* Polarity of VSYNC signal */
+#define LCDCTRL_VSDELAY(v)	(((v) & 0xfff) << 20) /* VSYNC delay */
+
+/* First parameter is in the 16bits, second is in the top 16bits */
+#define LCD_HS_HBP		0x0424
+#define LCD_HDISP_HFP		0x0428
+#define LCD_VS_VBP		0x042c
+#define LCD_VDISP_VFP		0x0430
+
+/* SPI Master Registers */
+#define SPICMR			0x0450
+#define SPITCR			0x0454
+
+/* System Controller Registers */
+#define SYSCTRL			0x0464
+
+/* System registers */
+#define LPX_PERIOD		3
+
+/* Lane enable PPI and DSI register bits */
+#define LANEENABLE_CLEN		BIT(0)
+#define LANEENABLE_L0EN		BIT(1)
+#define LANEENABLE_L1EN		BIT(2)
+
+struct rpi_touchscreen {
+	struct device *dev;
+	struct mipi_dsi_info *dsi;
+};
+
+#if 1
+/* modern RPi from official RPi kernel
+ * drivers/gpu/drm/panel/panel-simple.c, raspberrypi_7inch_mode
+ * fine-tuned form MaaxRT */
+static struct fb_videomode lcd_mode[] = {
+	/* 800 x 480 */
+	{
+		"rpi", 60, 800, 480, KHZ2PICOS(30000000 / 1000),
+		45, 136,
+		23, 8,
+		6, 6,
+		/* Both HSYNC and VSYNC active low */
+		/*FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT*/ 0,
+		FB_VMODE_NONINTERLACED,
+		0,
+	}
+};
+#endif
+
+#if 0
+/* drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c */
+static struct fb_videomode lcd_mode[] = {
+	/* 800 x 480 */
+	{
+		"rpi", 60, 800, 480, KHZ2PICOS(25979400 / 1000),
+		47, 1,
+		21, 7,
+		2, 2,
+		/* Both HSYNC and VSYNC active low */
+		/*FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT*/ 0,
+		FB_VMODE_NONINTERLACED,
+		0,
+	}
+};
+#endif
+
+#if 0
+/* imx8 ports,
+ * drivers/gpu/drm/panel/panel-simple.c, powertip_ph800480t013_idf02 */
+static struct fb_videomode lcd_mode[] = {
+	/* 800 x 480 */
+	{
+		"rpi", 60, 800, 480, KHZ2PICOS(24750000 / 1000),
+		44, 54,
+		22, 49,
+		2, 2,
+		/* Both HSYNC and VSYNC active low */
+		/*FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT*/ 0,
+		FB_VMODE_NONINTERLACED,
+		0,
+	}
+};
+#endif
+
+
+static struct mipi_lcd_config lcd_config = {
+	.virtual_ch	= 0x0,
+	.data_lane_num  = 1,
+	.max_phy_clk    = 800,
+	.dpi_fmt	= MIPI_RGB888,
+};
+
+void mipid_rpi_get_lcd_videomode(struct fb_videomode **mode, int *size,
+				     struct mipi_lcd_config **data)
+{
+	*mode = &lcd_mode[0];
+	*size = ARRAY_SIZE(lcd_mode);
+	*data = &lcd_config;
+}
+
+static int rpi_touchscreen_write(struct rpi_touchscreen *ts, u16 reg, u32 val)
+{
+	u8 data[6];
+
+	data[0] = reg;
+	data[1] = reg >> 8;
+	data[2] = val;
+	data[3] = val >> 8;
+	data[4] = val >> 16;
+	data[5] = val >> 24;
+
+	if (ts->dsi->mipi_dsi_pkt_write(ts->dsi, MIPI_DSI_GENERIC_LONG_WRITE,
+					(u32 *)data, sizeof(data))) {
+		dev_err(&ts->dsi->pdev->dev, "DSI write failure!\n");
+	}
+
+	return 0;
+}
+
+#define rpi_touchscreen_dcs_write(ts, ret, cmd, param...) \
+	do {\
+		static const u8 data[] = {cmd, param};\
+		ret = local_dcs_write(ts, data, ARRAY_SIZE(data));\
+	} while (0)
+
+static int local_dcs_write(struct rpi_touchscreen *ts, const u8 *data,
+	unsigned int len)
+{
+	int rc;
+	u8 dt;
+
+	switch (len) {
+	case 0:
+		dt = MIPI_DSI_DCS_SHORT_WRITE;
+		break;
+	case 1:
+		dt = MIPI_DSI_DCS_SHORT_WRITE_PARAM;
+		break;
+	default:
+		dt = MIPI_DSI_DCS_LONG_WRITE;
+		break;
+	}
+
+	rc = ts->dsi->mipi_dsi_pkt_write(ts->dsi, dt, (u32 *)data, len);
+	if (rc)
+		dev_err(&ts->dsi->pdev->dev, "DSI write failure!\n");
+
+	return rc;
+}
+
+static int rpi_touchscreen_enable(struct rpi_touchscreen *ts)
+{
+	u32 lcdctrl;
+	int ret;
+
+	rpi_touchscreen_write(ts, DSI_LANEENABLE,
+		       LANEENABLE_L0EN | LANEENABLE_CLEN);
+	rpi_touchscreen_write(ts, PPI_D0S_CLRSIPOCOUNT, 5);
+	rpi_touchscreen_write(ts, PPI_D1S_CLRSIPOCOUNT, 5);
+	rpi_touchscreen_write(ts, PPI_D0S_ATMR, 0);
+	rpi_touchscreen_write(ts, PPI_D1S_ATMR, 0);
+	rpi_touchscreen_write(ts, PPI_LPTXTIMECNT, LPX_PERIOD);
+
+	rpi_touchscreen_write(ts, SPICMR, 0x00);
+
+	lcdctrl = LCDCTRL_VSDELAY(1) | LCDCTRL_RGB888 |
+		  LCDCTRL_UNK6 | LCDCTRL_VTGEN;
+
+	if (!(lcd_mode->sync & FB_SYNC_HOR_HIGH_ACT))
+		lcdctrl |= LCDCTRL_HSPOL;
+
+	if (!(lcd_mode->sync & FB_SYNC_VERT_HIGH_ACT))
+		lcdctrl |= LCDCTRL_VSPOL;
+
+	rpi_touchscreen_write(ts, LCDCTRL, lcdctrl);
+
+	rpi_touchscreen_write(ts, SYSCTRL, 0x040f);
+
+	rpi_touchscreen_write(ts, LCD_HS_HBP, (lcd_mode->hsync_len) |
+		       ((lcd_mode->left_margin) << 16));
+	rpi_touchscreen_write(ts, LCD_HDISP_HFP, (lcd_mode->xres) |
+		       ((lcd_mode->right_margin) << 16));
+	rpi_touchscreen_write(ts, LCD_VS_VBP, (lcd_mode->vsync_len) |
+		       ((lcd_mode->upper_margin) << 16));
+	rpi_touchscreen_write(ts, LCD_VDISP_VFP, (lcd_mode->yres) |
+		       ((lcd_mode->lower_margin) << 16));
+	msleep(100);
+
+	rpi_touchscreen_write(ts, PPI_STARTPPI, PPI_START_FUNCTION);
+	rpi_touchscreen_write(ts, DSI_STARTDSI, DSI_RX_START);
+
+	msleep(100);
+	rpi_touchscreen_dcs_write(ts, ret, MIPI_DCS_EXIT_SLEEP_MODE);
+	msleep(100);
+
+	rpi_touchscreen_dcs_write(ts, ret, MIPI_DCS_SET_DISPLAY_ON);
+	msleep(100);
+
+	return 0;
+}
+
+int mipid_rpi_lcd_setup(struct mipi_dsi_info *mipi_dsi)
+{
+	int err = 0;
+	struct rpi_touchscreen ts_dev = {0};
+
+
+	dev_info(&mipi_dsi->pdev->dev, "MIPI DSI LCD RPI setup.\n");
+
+	ts_dev.dev = &mipi_dsi->pdev->dev;
+	ts_dev.dsi = mipi_dsi;
+
+	err = rpi_touchscreen_enable(&ts_dev);
+
+	return err;
+}

From eba132f2245f38d3ee85ec92113c36a5b6e33455 Mon Sep 17 00:00:00 2001
From: Dmitry Rakhchev <rda@emcraft.com>
Date: Wed, 25 Mar 2026 18:15:51 +0300
Subject: [PATCH 3/5] mipi_dsi_northwest: output DSI clock/lanes info

---
 drivers/video/fbdev/mxc/mipi_dsi_northwest.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/video/fbdev/mxc/mipi_dsi_northwest.c b/drivers/video/fbdev/mxc/mipi_dsi_northwest.c
index 066b8ad39b1fe..c53d16e2ef922 100644
--- a/drivers/video/fbdev/mxc/mipi_dsi_northwest.c
+++ b/drivers/video/fbdev/mxc/mipi_dsi_northwest.c
@@ -455,6 +455,8 @@ static int mipi_dsi_dphy_init(struct mipi_dsi_info *mipi_dsi)
 			"requested data lane num is invalid\n");
 		return -EINVAL;
 	}
+	dev_info(&mipi_dsi->pdev->dev, "DSI bit clock: %u bpp %u lanes %u\n",
+		req_bit_clk, bpp, lcd_config->data_lane_num);
 
 	if (mipi_dsi->encoder) {
 		if (req_bit_clk > lcd_config->max_phy_clk)

From 0e01f48b9e4a96a03cec67af494f13d240288b82 Mon Sep 17 00:00:00 2001
From: Dmitry Rakhchev <rda@emcraft.com>
Date: Wed, 25 Mar 2026 18:17:14 +0300
Subject: [PATCH 4/5] mipi_dsi_northwest: Allow using panel in
 DSI_NON_BURST_WITH_SYNC_PULSE mode

Rework calculation of horizontal timings for video + sync pulse
based on drivers/gpu/drm/bridge/nwl-dsi.c

Add dedicated properties for non-continuous clock and automatic EOTP insert

Also allow override them from device tree.
---
 drivers/video/fbdev/mxc/mipi_dsi.h           |  4 +-
 drivers/video/fbdev/mxc/mipi_dsi_northwest.c | 53 ++++++++++++++++++--
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/drivers/video/fbdev/mxc/mipi_dsi.h b/drivers/video/fbdev/mxc/mipi_dsi.h
index d19edd85a57a4..9a06cbc91af93 100644
--- a/drivers/video/fbdev/mxc/mipi_dsi.h
+++ b/drivers/video/fbdev/mxc/mipi_dsi.h
@@ -121,7 +121,9 @@ struct mipi_dsi_info {
 	int				dsi_power_on;
 	int				lcd_inited;
 	int				encoder;
-	int				traffic_mode;
+	u32				traffic_mode;
+	u32				non_continuous_clock;
+	u32				auto_eotp;
 	u32				dphy_pll_config;
 	int				dev_id;
 	int				disp_id;
diff --git a/drivers/video/fbdev/mxc/mipi_dsi_northwest.c b/drivers/video/fbdev/mxc/mipi_dsi_northwest.c
index c53d16e2ef922..9b77ae9e94dcf 100644
--- a/drivers/video/fbdev/mxc/mipi_dsi_northwest.c
+++ b/drivers/video/fbdev/mxc/mipi_dsi_northwest.c
@@ -381,10 +381,12 @@ static void mipi_dsi_set_mode(struct mipi_dsi_info *mipi_dsi,
 
 	switch (mode) {
 	case DSI_LP_MODE:
-		writel(0x1, mipi_dsi->mmio_base + HOST_CFG_NONCONTINUOUS_CLK);
+		writel(mipi_dsi->non_continuous_clock,
+			mipi_dsi->mmio_base + HOST_CFG_NONCONTINUOUS_CLK);
 		break;
 	case DSI_HS_MODE:
 		writel(0x0, mipi_dsi->mmio_base + HOST_CFG_NONCONTINUOUS_CLK);
+
 		break;
 	default:
 		dev_err(&mipi_dsi->pdev->dev,
@@ -703,13 +705,13 @@ static int mipi_dsi_host_init(struct mipi_dsi_info *mipi_dsi)
 #endif
 
 	writel(lane_num, mipi_dsi->mmio_base + HOST_CFG_NUM_LANES);
-	writel(mipi_dsi->encoder ? 0x0 : 0x1,
+	writel(mipi_dsi->non_continuous_clock,
 	       mipi_dsi->mmio_base + HOST_CFG_NONCONTINUOUS_CLK);
 	writel(0x1, mipi_dsi->mmio_base + HOST_CFG_T_PRE);
 	writel(52, mipi_dsi->mmio_base + HOST_CFG_T_POST);
 	writel(13, mipi_dsi->mmio_base + HOST_CFG_TX_GAP);
-	writel(mipi_dsi->encoder ? 0x0 : 0x1,
-	       mipi_dsi->mmio_base + HOST_CFG_AUTOINSERT_EOTP);
+	writel(mipi_dsi->auto_eotp,
+		mipi_dsi->mmio_base + HOST_CFG_AUTOINSERT_EOTP);
 	writel(0x0, mipi_dsi->mmio_base + HOST_CFG_EXTRA_CMDS_AFTER_EOTP);
 	writel(0x0, mipi_dsi->mmio_base + HOST_CFG_HTX_TO_COUNT);
 	writel(0x0, mipi_dsi->mmio_base + HOST_CFG_LRX_H_TO_COUNT);
@@ -725,8 +727,12 @@ static int mipi_dsi_dpi_init(struct mipi_dsi_info *mipi_dsi)
 	uint32_t pixel_fifo_level, hfp_period, hbp_period, hsa_period;
 	struct fb_videomode *mode = mipi_dsi->mode;
 	struct mipi_lcd_config *lcd_config = mipi_dsi->lcd_config;
+	uint32_t bytes_per_pixel;
+	uint32_t blank;
+	uint32_t pl, phl;
 
 	bpp = fmt_to_bpp(lcd_config->dpi_fmt);
+	bytes_per_pixel = bpp / 8;
 
 	writel(mode->xres, mipi_dsi->mmio_base + DPI_PIXEL_PAYLOAD_SIZE);
 
@@ -743,6 +749,28 @@ static int mipi_dsi_dpi_init(struct mipi_dsi_info *mipi_dsi)
 		hbp_period = 0x60;
 		hsa_period = 0xf0;
 #endif
+
+		/* see drivers/gpu/drm/bridge/nwl-dsi.c */
+		pixel_fifo_level = mode->xres;
+		hfp_period = mode->right_margin * bytes_per_pixel;
+		hbp_period = mode->left_margin * bytes_per_pixel;
+		hsa_period = mode->hsync_len * bytes_per_pixel;
+		/* should be even ?*/
+		hfp_period = roundup(hfp_period, 2);
+		hbp_period = roundup(hbp_period, 2);
+		hsa_period = roundup(hsa_period, 2);
+
+		blank = hfp_period + hbp_period + hsa_period;
+		pl = roundup(((hfp_period * 100 / blank) * 32) / 100, 2);
+		phl = pl;
+		hfp_period -= pl;
+		pl = roundup(((hbp_period * 100 / blank) * 32) / 100, 2);
+		phl += pl;
+		hbp_period -= pl;
+
+		hsa_period -= (phl <= 32) ? 32 - phl : 0;
+		dev_dbg(&mipi_dsi->pdev->dev, " Actual hfp/hsa/hbp: %u/%u/%u",
+			hfp_period, hsa_period, hbp_period);
 		break;
 	case DSI_BURST_MODE:
 		pixel_fifo_level = mode->xres;
@@ -787,6 +815,8 @@ static int mipi_dsi_dpi_init(struct mipi_dsi_info *mipi_dsi)
 	writel(0x0, mipi_dsi->mmio_base + DPI_VSYNC_POLARITY);
 	writel(0x0, mipi_dsi->mmio_base + DPI_HSYNC_POLARITY);
 #endif
+	dev_info(&mipi_dsi->pdev->dev, "%s: traffic_mode:%u\n",
+		__func__, mipi_dsi->traffic_mode);
 	writel(mipi_dsi->traffic_mode,
 	       mipi_dsi->mmio_base + DPI_VIDEO_MODE);
 
@@ -1396,6 +1426,12 @@ static int mipi_dsi_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 #endif
+	/* Properties names should be inverted, but to keep backward
+	 * compatibility no property is treated as previously default value */
+	mipi_dsi->non_continuous_clock = !of_property_read_bool(np,
+		"continuous-clock");
+	mipi_dsi->auto_eotp = !of_property_read_bool(np, "no-auto-eotp");
+
 	/* check whether an encoder exists */
 	endpoint = of_graph_get_next_endpoint(np, NULL);
 	if (endpoint) {
@@ -1433,9 +1469,16 @@ static int mipi_dsi_probe(struct platform_device *pdev)
 		}
 
 		mipi_dsi->encoder = 1;
+		/* backward compatibility: this settings depended on encoder.
+		 * set option values to match */
+		mipi_dsi->non_continuous_clock = 0;
+		mipi_dsi->auto_eotp = 0;
 	} else {
 		/* Default, using 'BURST-MODE' for mipi panel */
-		mipi_dsi->traffic_mode = 2;
+		ret = of_property_read_u32(np, "dsi-traffic-mode",
+			&mipi_dsi->traffic_mode);
+		if (ret < 0 || mipi_dsi->traffic_mode > 2)
+			mipi_dsi->traffic_mode = DSI_BURST_MODE;
 
 		ret = of_property_read_string(np, "lcd_panel", &lcd_panel);
 		if (ret) {

From 7edead5896b1aeb3006ef7cd6f3e5d88d9ff761e Mon Sep 17 00:00:00 2001
From: Dmitry Rakhchev <rda@emcraft.com>
Date: Wed, 25 Mar 2026 17:56:21 +0300
Subject: [PATCH 5/5] mipi_dsi_northwest: Fix comment

---
 drivers/video/fbdev/mxc/mipi_dsi_northwest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/mxc/mipi_dsi_northwest.c b/drivers/video/fbdev/mxc/mipi_dsi_northwest.c
index 9b77ae9e94dcf..12859070b6588 100644
--- a/drivers/video/fbdev/mxc/mipi_dsi_northwest.c
+++ b/drivers/video/fbdev/mxc/mipi_dsi_northwest.c
@@ -1106,7 +1106,7 @@ static int mipi_dsi_pkt_write(struct mipi_dsi_info *mipi_dsi,
 	const uint8_t *data = (const uint8_t *)buf;
 
 	if (len == 0)
-		/* handle generic long write command */
+		/* handle generic short write command */
 		mipi_dsi_wr_tx_header(mipi_dsi, data_type, data[0], data[1], DSI_LP_MODE, 0);
 	else {
 		reinit_completion(&dsi_tx_done);