From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF116324703
	for <linux-kernel@vger.kernel.org>; Mon, 17 Nov 2025 09:04:25 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1763370267; cv=none; b=HJhXAcdJGrPwulDvWpnINhUrCmWBNBx+qNFPhZyjXLKRB1A9cWVCOiNQfgPL1n+uZHD4xXCGg0lUPd0Fu6YNBaLdMGgu03y3SqLtGt/QZrcchIMHhr259hSF8sIWUC7Od6LROmo2Fb/hrLXQbpGn0oQSM6bWH0s1ev3uqj9Lj08=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1763370267; c=relaxed/simple;
	bh=zhGfd310V5DKHoDZa0//qQ74zGXU+hIHrqN5ed22Y4c=;
	h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:
	 In-Reply-To:To:Cc; b=QFVUvAhcPDD0V0mOTyFYVYUHB+1oNR70w1ZaBXtZtUsxSiXZymxg4WGXIA6mCdr4ORVG7f4KDU2JBtwVEcpDhnztObk41ytl8/dGvlZDXXB2g9eueIGujYbL9G2J6D8YhhEqZc9jJVqaQMf8yXzzgq2aOAv1bMWSAI9VWA0NGJc=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=L6PYB+jq; arc=none smtp.client-ip=209.85.167.45
Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L6PYB+jq"
Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5958232f806so3770622e87.0
        for <linux-kernel@vger.kernel.org>; Mon, 17 Nov 2025 01:04:25 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1763370264; x=1763975064; darn=vger.kernel.org;
        h=cc:to:in-reply-to:references:message-id:content-transfer-encoding
         :mime-version:subject:date:from:from:to:cc:subject:date:message-id
         :reply-to;
        bh=Medmr2NpoJOVqoNvO0X+FtHTdqh1wez08B1RhOyS7Dg=;
        b=L6PYB+jqh9HARKh/+RHv6OAEnYOh7IVO2zaxJ+FmAwq9Zt+sz8iKhKsJh9q2Now3YT
         m+pKYrZg7K5JoaqHHE+MqSfWxGgDnxHLSyqiLSvweH/wSmet2XSfOBwuxytILmIVqzmO
         nuRWjGBmyQkFXq447wCCZDzeRBpZ7ay+Ro8+c2WLAG3LYwSN5AHUbUQ6rcfjrDE2hOMB
         UT270QExfEjvA3EmEZPNhoTOxlgD3fuVkAq9Y6mkBD/2Rk1Axm3dJ9QTKDoBRaZl0nPC
         fqd4HYJ2FAvBWRqlvZ5tZzrc98bC6NzPR97AkeiCPdfZBWgOZIN4BBuUy6k6C3kWVQSd
         N/PQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1763370264; x=1763975064;
        h=cc:to:in-reply-to:references:message-id:content-transfer-encoding
         :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to
         :cc:subject:date:message-id:reply-to;
        bh=Medmr2NpoJOVqoNvO0X+FtHTdqh1wez08B1RhOyS7Dg=;
        b=ZzG1y6hGnV0jKVvhEZ7FTxRD3DJw5uwwtOmo+e33nggxYksU1wtc6m5bWlQ/jEL0YK
         LN6MAFmurGDf2zsTkOtpFt2x+5UP5sRQ+p5GwBlzlutQ3+06mBz3Kecwqj15e2hX2wGr
         HJqbN9xjT4AeMPshztert9rfPABGdF1ThKoJIt/cLSHYYpiGfVgeUSBj5yQj8WNTsSFE
         YGxV0H//nsDbJy4//Zv/Z1mmVthONEq6P1Gp66wZkaosmky0bnfyVWFwvhcNigx/iBgi
         wCMTeS74Fi0k0bWf9+9SrV5ck0SDAVKOcI+KJngeyAkZvH1WcHlkCjQLmsRNkQkmAYaG
         nnJg==
X-Forwarded-Encrypted: i=1; AJvYcCUr8qO8kDOoMAgPHt1SHsY7Cv7aUXb4v+E75gqG7p8wIP7PR58M4eF3ZkMvu8BctVPVbbmWhUzTCXV9xA4=@vger.kernel.org
X-Gm-Message-State: AOJu0Yzm51GywQ2egprwgOJrgZvabiAZ+gKtfbUXPjWP8DFD0ah4tidz
	eio7ZAbhhneBqEyiLoCdRzKs4aAPuQZVL8no65eQhSZYQ7JZk6oCVewaUpb2EQ==
X-Gm-Gg: ASbGncvhwCROrN9HYxXvaCDHBRB4W5hI181JpFR4EfDLskbe/cuU55KIAZKIX07gs3h
	dw0Na4s8jpdh2d3vCSqbIMBRWHBkb6WbWpPddiXgTMg6L/ikW4+MzU3LKZxoAUeBQXxymzILRqg
	cdWiEsmDJcsaNSRiESSY1dctRuB8KSVp6XiddDvPV+/vKTKwixpV7UjOh0NFFbpMTZhGcUr0Ibf
	RXJ6WKqtHTT1akneNbkphhS3WjWKIoMW12D1xHU0DAIu3xZFGu6sDMxGYX4dJ+HYpXMudq4NW2g
	TLrEcJ4WbKwjQucVZjo7KQoxWDcBo1CC4OnnT6AkKnTZ1itZ2LTVDyITYigu76gAnHPBYio92By
	vNWC6EZ7c+vnFb3xfzmsQXX9J2XHB5MFZXMhfiNVTIUcWepFdp+CwI0B+ckcDf4xcdhM6kQIRFv
	tr1GsdAATi0q8zX6IU4Qyn1MdVbaFDMckzp5h4y/3iQR3qdA==
X-Google-Smtp-Source: AGHT+IHfUAXz6QD6/Zy95WEXKjEmC+vnADNovnfZb7E4//JyqiX73gNeKYwHRIV4UlMWXyDXmfiMYg==
X-Received: by 2002:a05:6512:3e04:b0:57b:7c83:d33b with SMTP id 2adb3069b0e04-59584224b88mr3805201e87.47.1763370263428;
        Mon, 17 Nov 2025 01:04:23 -0800 (PST)
Received: from [192.168.1.168] (83-233-6-197.cust.bredband2.com. [83.233.6.197])
        by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-595803b77e5sm2982498e87.42.2025.11.17.01.04.21
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Mon, 17 Nov 2025 01:04:22 -0800 (PST)
From: Marcus Folkesson <marcus.folkesson@gmail.com>
Date: Mon, 17 Nov 2025 10:03:45 +0100
Subject: [PATCH RESEND v2 3/6] drm/sitronix/st7571-i2c: move common
 structures to st7571.h
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Message-Id: <20251117-st7571-split-v2-3-13189da95265@gmail.com>
References: <20251117-st7571-split-v2-0-13189da95265@gmail.com>
In-Reply-To: <20251117-st7571-split-v2-0-13189da95265@gmail.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, 
 Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, 
 David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, 
 Marcus Folkesson <marcus.folkesson@gmail.com>
X-Mailer: b4 0.14.3
X-Developer-Signature: v=1; a=openpgp-sha256; l=7722;
 i=marcus.folkesson@gmail.com; h=from:subject:message-id;
 bh=zhGfd310V5DKHoDZa0//qQ74zGXU+hIHrqN5ed22Y4c=;
 b=owEBbQKS/ZANAwAKAYiATm9ZXVIyAcsmYgBpGuT/az8drxCbOwt0fGdPwv3Bd52t2BlOI2fdB
 A3oMlGuk6yJAjMEAAEKAB0WIQQFUaLotmy1TWTBLGWIgE5vWV1SMgUCaRrk/wAKCRCIgE5vWV1S
 MmngEACfDwCbQ9Btkn+J9mK+N3d4rndsVKwVSPrV/2QljeDNFlhM3NLqlV+CWp1ybAfE150sIqx
 xBFnsSrdwhV2BK6L7ENnhMivrrz8gaHGVn0K9vGMxn7zq4QdpJD/rvuCaNhhpoPQRtj8MKBDKib
 jBlWafAABJlE0q6t6kNltpSO+BdaIDmla5g8Q9ocqZR2xOEIjFyXiB3GFldKBkye7ALkoqxW7p6
 qFMuXV9SmoilNYvcb6UyYKc+CaPsor56RuU9x4a4vWn3UZ0AEe2eAUgjrLlmZg5TA8Pee0YvNVj
 PA28G8f3motPf4qsiLJRtKrNm3JNPTGNCsisgBB+96odZ/dqrO4RMtKQxgEnW0Uuc0o+gqLABfP
 t4Xiero5+4Ibqii0i1OXVPu+auSWUUktBN6pNp5TK0/TfHn74Q35Gw6OKu2WKBXn8n6zj5BKO91
 pzmThgaww+0UTIwfujd3kk4Zc3r3t0m4OVkSn+eZQXFbbg5GWL4Kh0zPh1OzhzS1WtzHkPvgRQB
 7u881uV5rDXwtZyGnob3368VpyYdz0rs8d0JjFkd3ce5oFIEkWMZoVUGF1KZ7YdizyCbdPvJN9G
 Tg3dAxNcNrTW5byrQwUhvyocsTpYmgKnTjBSvFzBsxYNQTIbH94PoclDjpoy8k1ybZ5EMgZd4sB
 xy31vQlITrGnoNg==
X-Developer-Key: i=marcus.folkesson@gmail.com; a=openpgp;
 fpr=AB91D46C7E0F6E6FB2AB640EC0FE25D598F6C127

Move all structures that will be common for all interfaces (SPI/I2C) to
a separate header file.

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
 MAINTAINERS                           |   1 +
 drivers/gpu/drm/sitronix/st7571-i2c.c |  91 +---------------------------
 drivers/gpu/drm/sitronix/st7571.h     | 108 ++++++++++++++++++++++++++++++++++
 3 files changed, 111 insertions(+), 89 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index cc8a7f3f1dab..2814faae61ec 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8083,6 +8083,7 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/display/sitronix,st7567.yaml
 F:	Documentation/devicetree/bindings/display/sitronix,st7571.yaml
 F:	drivers/gpu/drm/sitronix/st7571-i2c.c
+F:	drivers/gpu/drm/sitronix/st7571.h
 
 DRM DRIVER FOR SITRONIX ST7701 PANELS
 M:	Jagan Teki <jagan@amarulasolutions.com>
diff --git a/drivers/gpu/drm/sitronix/st7571-i2c.c b/drivers/gpu/drm/sitronix/st7571-i2c.c
index 2b52919d7dd4..af27658a5e15 100644
--- a/drivers/gpu/drm/sitronix/st7571-i2c.c
+++ b/drivers/gpu/drm/sitronix/st7571-i2c.c
@@ -35,6 +35,8 @@
 #include <video/display_timing.h>
 #include <video/of_display_timing.h>
 
+#include "st7571.h"
+
 #define ST7571_COMMAND_MODE			(0x00)
 #define ST7571_DATA_MODE			(0x40)
 
@@ -78,95 +80,6 @@
 #define DRIVER_MAJOR 1
 #define DRIVER_MINOR 0
 
-enum st7571_color_mode {
-	ST7571_COLOR_MODE_GRAY = 0,
-	ST7571_COLOR_MODE_BLACKWHITE = 1,
-};
-
-struct st7571_device;
-
-struct st7571_panel_constraints {
-	u32 min_nlines;
-	u32 max_nlines;
-	u32 min_ncols;
-	u32 max_ncols;
-	bool support_grayscale;
-};
-
-struct st7571_panel_data {
-	int (*init)(struct st7571_device *st7571);
-	int (*parse_dt)(struct st7571_device *st7571);
-	struct st7571_panel_constraints constraints;
-};
-
-struct st7571_panel_format {
-	void (*prepare_buffer)(struct st7571_device *st7571,
-			       const struct iosys_map *vmap,
-			       struct drm_framebuffer *fb,
-			       struct drm_rect *rect,
-			       struct drm_format_conv_state *fmtcnv_state);
-	int (*update_rect)(struct drm_framebuffer *fb, struct drm_rect *rect);
-	enum st7571_color_mode mode;
-	const u8 nformats;
-	const u32 formats[];
-};
-
-struct st7571_device {
-	struct drm_device drm;
-	struct device *dev;
-
-	struct drm_plane primary_plane;
-	struct drm_crtc crtc;
-	struct drm_encoder encoder;
-	struct drm_connector connector;
-
-	struct drm_display_mode mode;
-
-	const struct st7571_panel_format *pformat;
-	const struct st7571_panel_data *pdata;
-	struct i2c_client *client;
-	struct gpio_desc *reset;
-	struct regmap *regmap;
-
-	/*
-	 * Depending on the hardware design, the acknowledge signal may be hard to
-	 * recognize as a valid logic "0" level.
-	 * Therefor, ignore NAK if possible to stay compatible with most hardware designs
-	 * and off-the-shelf panels out there.
-	 *
-	 * From section 6.4 MICROPOCESSOR INTERFACE section in the datasheet:
-	 *
-	 * "By connecting SDA_OUT to SDA_IN externally, the SDA line becomes fully
-	 * I2C interface compatible.
-	 * Separating acknowledge-output from serial data
-	 * input is advantageous for chip-on-glass (COG) applications. In COG
-	 * applications, the ITO resistance and the pull-up resistor will form a
-	 * voltage  divider, which affects acknowledge-signal level. Larger ITO
-	 * resistance will raise the acknowledged-signal level and system cannot
-	 * recognize this level as a valid logic “0” level. By separating SDA_IN from
-	 * SDA_OUT, the IC can be used in a mode that ignores the acknowledge-bit.
-	 * For applications which check acknowledge-bit, it is necessary to minimize
-	 * the ITO resistance of the SDA_OUT trace to guarantee a valid low level."
-	 *
-	 */
-	bool ignore_nak;
-
-	bool grayscale;
-	bool inverted;
-	u32 height_mm;
-	u32 width_mm;
-	u32 startline;
-	u32 nlines;
-	u32 ncols;
-	u32 bpp;
-
-	/* Intermediate buffer in LCD friendly format */
-	u8 *hwbuf;
-
-	/* Row of (transformed) pixels ready to be written to the display */
-	u8 *row;
-};
-
 static inline struct st7571_device *drm_to_st7571(struct drm_device *drm)
 {
 	return container_of(drm, struct st7571_device, drm);
diff --git a/drivers/gpu/drm/sitronix/st7571.h b/drivers/gpu/drm/sitronix/st7571.h
new file mode 100644
index 000000000000..c6fd6f1d3aa3
--- /dev/null
+++ b/drivers/gpu/drm/sitronix/st7571.h
@@ -0,0 +1,108 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Header file for:
+ * Driver for Sitronix ST7571, a 4 level gray scale dot matrix LCD controller
+ *
+ * Copyright (C) 2025 Marcus Folkesson <marcus.folkesson@gmail.com>
+ */
+
+#ifndef __ST7571_H__
+#define __ST7571_H__
+
+#include <drm/drm_connector.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_encoder.h>
+
+#include <linux/regmap.h>
+
+enum st7571_color_mode {
+	ST7571_COLOR_MODE_GRAY = 0,
+	ST7571_COLOR_MODE_BLACKWHITE = 1,
+};
+
+struct st7571_device;
+
+struct st7571_panel_constraints {
+	u32 min_nlines;
+	u32 max_nlines;
+	u32 min_ncols;
+	u32 max_ncols;
+	bool support_grayscale;
+};
+
+struct st7571_panel_data {
+	int (*init)(struct st7571_device *st7571);
+	int (*parse_dt)(struct st7571_device *st7571);
+	struct st7571_panel_constraints constraints;
+};
+
+struct st7571_panel_format {
+	void (*prepare_buffer)(struct st7571_device *st7571,
+			       const struct iosys_map *vmap,
+			       struct drm_framebuffer *fb,
+			       struct drm_rect *rect,
+			       struct drm_format_conv_state *fmtcnv_state);
+	int (*update_rect)(struct drm_framebuffer *fb, struct drm_rect *rect);
+	enum st7571_color_mode mode;
+	const u8 nformats;
+	const u32 formats[];
+};
+
+struct st7571_device {
+	struct drm_device drm;
+	struct device *dev;
+
+	struct drm_plane primary_plane;
+	struct drm_crtc crtc;
+	struct drm_encoder encoder;
+	struct drm_connector connector;
+
+	struct drm_display_mode mode;
+
+	const struct st7571_panel_format *pformat;
+	const struct st7571_panel_data *pdata;
+	struct i2c_client *client;
+	struct gpio_desc *reset;
+	struct regmap *regmap;
+
+	/*
+	 * Depending on the hardware design, the acknowledge signal may be hard to
+	 * recognize as a valid logic "0" level.
+	 * Therefor, ignore NAK if possible to stay compatible with most hardware designs
+	 * and off-the-shelf panels out there.
+	 *
+	 * From section 6.4 MICROPOCESSOR INTERFACE section in the datasheet:
+	 *
+	 * "By connecting SDA_OUT to SDA_IN externally, the SDA line becomes fully
+	 * I2C interface compatible.
+	 * Separating acknowledge-output from serial data
+	 * input is advantageous for chip-on-glass (COG) applications. In COG
+	 * applications, the ITO resistance and the pull-up resistor will form a
+	 * voltage  divider, which affects acknowledge-signal level. Larger ITO
+	 * resistance will raise the acknowledged-signal level and system cannot
+	 * recognize this level as a valid logic “0” level. By separating SDA_IN from
+	 * SDA_OUT, the IC can be used in a mode that ignores the acknowledge-bit.
+	 * For applications which check acknowledge-bit, it is necessary to minimize
+	 * the ITO resistance of the SDA_OUT trace to guarantee a valid low level."
+	 *
+	 */
+	bool ignore_nak;
+
+	bool grayscale;
+	bool inverted;
+	u32 height_mm;
+	u32 width_mm;
+	u32 startline;
+	u32 nlines;
+	u32 ncols;
+	u32 bpp;
+
+	/* Intermediate buffer in LCD friendly format */
+	u8 *hwbuf;
+
+	/* Row of (transformed) pixels ready to be written to the display */
+	u8 *row;
+};
+
+#endif /* __ST7571_H__ */

-- 
2.51.2