From patchwork Sat Nov 11 10:41:50 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dario Binacchi <dario.binacchi@amarulasolutions.com>
X-Patchwork-Id: 743208
Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net
 [23.128.96.19])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7133712B78
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 10:42:41 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 dkim=pass (1024-bit key) header.d=amarulasolutions.com
 header.i=@amarulasolutions.com header.b="ONatCP+N"
Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com
 [IPv6:2a00:1450:4864:20::641])
 by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 172993C05
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 02:42:39 -0800 (PST)
Received: by mail-ej1-x641.google.com with SMTP id
 a640c23a62f3a-9e62ab773f1so215570866b.0
 for <linux-fbdev@vger.kernel.org>;
 Sat, 11 Nov 2023 02:42:39 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=amarulasolutions.com; s=google; t=1699699357; x=1700304157;
 darn=vger.kernel.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=eutcu8nha5gIvSO1Nw/orY10THf/Z0yjX5SxOR1EIyg=;
 b=ONatCP+NCjimx7glVaUqlVQ1ccgIpvANjCL1+dniTAcpHf0/dDPx1lvfu8g8QnQfus
 PglkSM7SxDlHi3rMtUarf7m0UJBvQ2lL3yJ6Hjr5Zzbp6pn6Qkm7eT1LCK+YiIm0IspF
 owGlYdVDDr+VxNWkxLBIPVFmpsgOCZ6WaYypw=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1699699357; x=1700304157;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=eutcu8nha5gIvSO1Nw/orY10THf/Z0yjX5SxOR1EIyg=;
 b=A2QZFjbM/pDPNwv9yewTEHfBZ1stpUI3dU8dSmZ3sQK4aUzMILEFOco2AkIL7TTW1X
 uSo8wm2hOV59aufDtWIq5rtcpHEHsMUxoeeKeyMeJ+fRElJ5tmQ3PgG5AqYBjH9z+urc
 ZWvKkFex9bZZcJVicoejo8OZEG6G0zZQ3vvrSfUS5E+Y32vZqvCWkOoEexS8yvsS+9dv
 kmt+SMLV0tpO/+ZKa7PXNKEOM9C9RO6UdcDHazatvm9iPTFknmKwSLcdFGgzSYzwoF2R
 D/dt6bvE1k7SKaBP9AJxEZZmN+Uere0CP89DZeEQbDrnh7+kF2AgupCSkXH7HMpMczAe
 Mvxw==
X-Gm-Message-State: AOJu0YyCZOq4wKHyLfJdjIwHIQwUsvWjYKZ5/pCWSPzvxtwdOHV0/0m9
 ifyHjFEfEfT88EjuCyxu5wl7ww==
X-Google-Smtp-Source: AGHT+IFaeH1R8CrvRx8lpT+f3/8b10gmDt0Mv/InNxCSXdSMqZkc1Dynsl2CrxZY/kuNg5o1BYLkuA==
X-Received: by 2002:a17:906:4742:b0:9bf:4915:22ca with SMTP id
 j2-20020a170906474200b009bf491522camr1072967ejs.45.1699699357215;
 Sat, 11 Nov 2023 02:42:37 -0800 (PST)
Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it
 (host-79-20-97-182.retail.telecomitalia.it. [79.20.97.182])
 by smtp.gmail.com with ESMTPSA id
 ga33-20020a1709070c2100b0099e12a49c8fsm872183ejc.173.2023.11.11.02.42.36
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 11 Nov 2023 02:42:36 -0800 (PST)
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: linux-amarula@amarulasolutions.com,
 Dario Binacchi <dario.binacchi@amarulasolutions.com>,
 Fabio Estevam <festevam@gmail.com>, Helge Deller <deller@gmx.de>,
 Martin Kaiser <martin@kaiser.cx>, NXP Linux Team <linux-imx@nxp.com>,
 Pengutronix Kernel Team <kernel@pengutronix.de>,
 Sascha Hauer <s.hauer@pengutronix.de>, Shawn Guo <shawnguo@kernel.org>,
 dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org,
 linux-fbdev@vger.kernel.org
Subject: [PATCH 01/10] fbdev: imxfb: fix left margin setting
Date: Sat, 11 Nov 2023 11:41:50 +0100
Message-ID: <20231111104225.136512-2-dario.binacchi@amarulasolutions.com>
X-Mailer: git-send-email 2.42.0
In-Reply-To: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
References: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
Precedence: bulk
X-Mailing-List: linux-fbdev@vger.kernel.org
List-Id: <linux-fbdev.vger.kernel.org>
List-Subscribe: <mailto:linux-fbdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-fbdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0

The previous setting did not take into account the CSTN mode.
For the H_WAIT_2 bitfield (bits 0-7) of the LCDC Horizontal Configuration
Register (LCDCR), the IMX25RM manual states that:

In TFT mode, it specifies the number of SCLK periods between the end of
HSYNC and the beginning of OE signal, and the total delay time equals
(H_WAIT_2 + 3) of SCLK periods.
In CSTN mode, it specifies the number of SCLK periods between the end of
HSYNC and the first display data in each line, and the total delay time
equals (H_WAIT_2 + 2) of SCLK periods.

The patch handles both cases.

Fixes: 4e47382fbca9 ("fbdev: imxfb: warn about invalid left/right margin")
Fixes: 7e8549bcee00 ("imxfb: Fix margin settings")
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

 drivers/video/fbdev/imxfb.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index 84201c9608d3..7042a43b81d8 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -42,6 +42,7 @@
 #include <video/videomode.h>
 
 #define PCR_TFT		(1 << 31)
+#define PCR_COLOR	(1 << 30)
 #define PCR_BPIX_8	(3 << 25)
 #define PCR_BPIX_12	(4 << 25)
 #define PCR_BPIX_16	(5 << 25)
@@ -150,6 +151,12 @@ enum imxfb_type {
 	IMX21_FB,
 };
 
+enum imxfb_panel_type {
+	PANEL_TYPE_MONOCHROME,
+	PANEL_TYPE_CSTN,
+	PANEL_TYPE_TFT,
+};
+
 struct imxfb_info {
 	struct platform_device  *pdev;
 	void __iomem		*regs;
@@ -157,6 +164,7 @@ struct imxfb_info {
 	struct clk		*clk_ahb;
 	struct clk		*clk_per;
 	enum imxfb_type		devtype;
+	enum imxfb_panel_type	panel_type;
 	bool			enabled;
 
 	/*
@@ -444,6 +452,13 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 	if (!is_imx1_fb(fbi) && imxfb_mode->aus_mode)
 		fbi->lauscr = LAUSCR_AUS_MODE;
 
+	if (imxfb_mode->pcr & PCR_TFT)
+		fbi->panel_type = PANEL_TYPE_TFT;
+	else if (imxfb_mode->pcr & PCR_COLOR)
+		fbi->panel_type = PANEL_TYPE_CSTN;
+	else
+		fbi->panel_type = PANEL_TYPE_MONOCHROME;
+
 	/*
 	 * Copy the RGB parameters for this display
 	 * from the machine specific parameters.
@@ -596,6 +611,7 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
 {
 	struct imxfb_info *fbi = info->par;
 	u32 ymax_mask = is_imx1_fb(fbi) ? YMAX_MASK_IMX1 : YMAX_MASK_IMX21;
+	u8 left_margin_low;
 
 	pr_debug("var: xres=%d hslen=%d lm=%d rm=%d\n",
 		var->xres, var->hsync_len,
@@ -604,6 +620,13 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
 		var->yres, var->vsync_len,
 		var->upper_margin, var->lower_margin);
 
+	if (fbi->panel_type == PANEL_TYPE_TFT)
+		left_margin_low = 3;
+	else if (fbi->panel_type == PANEL_TYPE_CSTN)
+		left_margin_low = 2;
+	else
+		left_margin_low = 0;
+
 #if DEBUG_VAR
 	if (var->xres < 16        || var->xres > 1024)
 		printk(KERN_ERR "%s: invalid xres %d\n",
@@ -611,7 +634,7 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
 	if (var->hsync_len < 1    || var->hsync_len > 64)
 		printk(KERN_ERR "%s: invalid hsync_len %d\n",
 			info->fix.id, var->hsync_len);
-	if (var->left_margin < 3  || var->left_margin > 255)
+	if (var->left_margin < left_margin_low  || var->left_margin > 255)
 		printk(KERN_ERR "%s: invalid left_margin %d\n",
 			info->fix.id, var->left_margin);
 	if (var->right_margin < 1 || var->right_margin > 255)
@@ -637,7 +660,7 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
 
 	writel(HCR_H_WIDTH(var->hsync_len - 1) |
 		HCR_H_WAIT_1(var->right_margin - 1) |
-		HCR_H_WAIT_2(var->left_margin - 3),
+		HCR_H_WAIT_2(var->left_margin - left_margin_low),
 		fbi->regs + LCDC_HCR);
 
 	writel(VCR_V_WIDTH(var->vsync_len) |

From patchwork Sat Nov 11 10:41:51 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dario Binacchi <dario.binacchi@amarulasolutions.com>
X-Patchwork-Id: 744259
Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net
 [23.128.96.19])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5C2112B61
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 10:42:42 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 dkim=pass (1024-bit key) header.d=amarulasolutions.com
 header.i=@amarulasolutions.com header.b="iUVTib7I"
Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com
 [IPv6:2a00:1450:4864:20::62c])
 by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45EAF9F
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 02:42:41 -0800 (PST)
Received: by mail-ej1-x62c.google.com with SMTP id
 a640c23a62f3a-9e62b14c9eeso215491466b.2
 for <linux-fbdev@vger.kernel.org>;
 Sat, 11 Nov 2023 02:42:40 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=amarulasolutions.com; s=google; t=1699699358; x=1700304158;
 darn=vger.kernel.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=cv+Nw99h5TQ+ZdPAOUHCJ7Is/AuyKPzv38qwm03SYTY=;
 b=iUVTib7IJ4nhaswszUcXNqeDYfL9gea5rmO66MPg09zFniiYdl8zeNd7NL/UI0WXr3
 kLBahdPopN5Tgd9pCNTkFE0JUd4OpJhp8WN0DGjLxLu26Q66OgCXa9a+4CUbZhXBu+nG
 2Frn8VH7h/uX9zsEua2SXecMfxyNoAku+QdO8=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1699699358; x=1700304158;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=cv+Nw99h5TQ+ZdPAOUHCJ7Is/AuyKPzv38qwm03SYTY=;
 b=jPGSYSElYs6BxrRDp+3w1BTz5hqedf+/YEYny8+2HZWPffPGj3LTW4GqkRL5XU/Mte
 XAIFlzhF1apL0s2ya/B5M+vFm9jBgZhPE4hbK+n/QcP9MnP+I0ZUbCMzk2iq6Rg6D3HG
 NMn+6SHLY40EtB8JO2/NzBQuM2XCgnxs3/wnWvNcyzZiyX3vWvengCse1sIGPe3Js4F5
 AXCSniH1N8+GPKNv3GfUscavff72seXeBMLZrGLFQ2PBkaF8QAtKoYQp5OL2k+41tGrm
 Ob8Zivp+gT2uiPI5TmGXdU2sP3RM7kNB5NLJ9y2K9Jhc4H8jH22rYbmyIswuDlU2Bax5
 ruNA==
X-Gm-Message-State: AOJu0YwVdlNRZJYLIQjGXvc7g7uE2VWTUsR2mFzAC2GpVMc379blOh0m
 zosdRJpxlhug43cHrsSbgP9yPQ==
X-Google-Smtp-Source: AGHT+IGV/oLH/5lcH7sOkoekG3D+ekNeJmSBIhCHEhoX0aYsTwH02HKUCdbRojD3+VixFTGso1kIJg==
X-Received: by 2002:a17:906:fc0a:b0:9e0:5d5c:aa81 with SMTP id
 ov10-20020a170906fc0a00b009e05d5caa81mr1063698ejb.27.1699699358600;
 Sat, 11 Nov 2023 02:42:38 -0800 (PST)
Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it
 (host-79-20-97-182.retail.telecomitalia.it. [79.20.97.182])
 by smtp.gmail.com with ESMTPSA id
 ga33-20020a1709070c2100b0099e12a49c8fsm872183ejc.173.2023.11.11.02.42.37
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 11 Nov 2023 02:42:38 -0800 (PST)
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: linux-amarula@amarulasolutions.com,
 Dario Binacchi <dario.binacchi@amarulasolutions.com>,
 Fabio Estevam <festevam@gmail.com>, Helge Deller <deller@gmx.de>,
 NXP Linux Team <linux-imx@nxp.com>,
 Pengutronix Kernel Team <kernel@pengutronix.de>,
 Sascha Hauer <s.hauer@pengutronix.de>, Shawn Guo <shawnguo@kernel.org>,
 dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org,
 linux-fbdev@vger.kernel.org
Subject: [PATCH 02/10] fbdev: imxfb: move PCR bitfields near their offset
Date: Sat, 11 Nov 2023 11:41:51 +0100
Message-ID: <20231111104225.136512-3-dario.binacchi@amarulasolutions.com>
X-Mailer: git-send-email 2.42.0
In-Reply-To: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
References: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
Precedence: bulk
X-Mailing-List: linux-fbdev@vger.kernel.org
List-Id: <linux-fbdev.vger.kernel.org>
List-Subscribe: <mailto:linux-fbdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-fbdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0

The patch moves the bitfields of the PCR register near the macro that
defines its offset, just like for all the other registers.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

 drivers/video/fbdev/imxfb.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index 7042a43b81d8..6af5f09d9c85 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -41,13 +41,6 @@
 #include <video/of_videomode.h>
 #include <video/videomode.h>
 
-#define PCR_TFT		(1 << 31)
-#define PCR_COLOR	(1 << 30)
-#define PCR_BPIX_8	(3 << 25)
-#define PCR_BPIX_12	(4 << 25)
-#define PCR_BPIX_16	(5 << 25)
-#define PCR_BPIX_18	(6 << 25)
-
 struct imx_fb_videomode {
 	struct fb_videomode mode;
 	u32 pcr;
@@ -88,6 +81,12 @@ struct imx_fb_videomode {
 #define LCDC_LCHCC	0x14
 
 #define LCDC_PCR	0x18
+#define PCR_TFT		(1 << 31)
+#define PCR_COLOR	(1 << 30)
+#define PCR_BPIX_8	(3 << 25)
+#define PCR_BPIX_12	(4 << 25)
+#define PCR_BPIX_16	(5 << 25)
+#define PCR_BPIX_18	(6 << 25)
 
 #define LCDC_HCR	0x1C
 #define HCR_H_WIDTH(x)	(((x) & 0x3f) << 26)

From patchwork Sat Nov 11 10:41:52 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dario Binacchi <dario.binacchi@amarulasolutions.com>
X-Patchwork-Id: 744258
Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net
 [23.128.96.19])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4025B12B87
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 10:42:44 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 dkim=pass (1024-bit key) header.d=amarulasolutions.com
 header.i=@amarulasolutions.com header.b="Y575gT7H"
Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com
 [IPv6:2a00:1450:4864:20::62b])
 by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B57593ABA
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 02:42:41 -0800 (PST)
Received: by mail-ej1-x62b.google.com with SMTP id
 a640c23a62f3a-9d267605ceeso453802666b.2
 for <linux-fbdev@vger.kernel.org>;
 Sat, 11 Nov 2023 02:42:41 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=amarulasolutions.com; s=google; t=1699699360; x=1700304160;
 darn=vger.kernel.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=GD7GxvQQhDBqOuYxhMX/0KhWBgo/RCUVCo38r5g0tkk=;
 b=Y575gT7HFEXke/YB+OIEhVJI7jyteWAT1A7Uik+NpE7R8SDT3Q6BkCwm5WmiLsQhHe
 r5CPDyCsoRyjh+8k9EiPso766VeQM9s0g9iYzYNWIrohXPxC9B/Joh8Yp4P5ByOm5cjA
 Tr29ksGoH9W75Nc8kVUZmAIsxm7lSnByN8zd0=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1699699360; x=1700304160;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=GD7GxvQQhDBqOuYxhMX/0KhWBgo/RCUVCo38r5g0tkk=;
 b=hUFfscB6Y22aiF3rOBMmuYMHOVAu6Nl23Ad46D7PUE2qbMqRBo6w9nAmzjKsbv+/Sv
 LJvwT1GfCi8GxTgBlnknYZkv8atYHr5Mj4zO0A3Y2T9e797C7pNkmsEUMHgJ1No1zDe1
 ln8nHSijwcQ0zZ3L0bAlEHFrl3+epiPnUIQMSTku6DGV7JGmmlOxkgyBr89WTZ00a++T
 fex0zTVmp+IuEV/K7oAXowN7Q9tcxp4Tgsm41wefv1fGEp35hjTT5bOjKBu/eCMHadQK
 UpfnaijmWFLJJm27s2EhGylS2+51+dJ7FCUN4s0I+6TIDPYtMWYuzNBaLQf6trHfzkgu
 ytFg==
X-Gm-Message-State: AOJu0YyDNP28EZxCmuGreZiQy86fY95sWJiqaaF6RiQ5KDvb89/fbCLg
 LR5K0BJVRFDQZMz5095wAvlNHQ==
X-Google-Smtp-Source: AGHT+IGHYHkviAvOpw70AvcnN4XN/6h6tersHWol4TbdSjxhfGLuFb7jUm6WceFPTOSJEgB1kWk4KA==
X-Received: by 2002:a17:906:7f94:b0:9c4:67f:3ef5 with SMTP id
 f20-20020a1709067f9400b009c4067f3ef5mr1052700ejr.50.1699699359971;
 Sat, 11 Nov 2023 02:42:39 -0800 (PST)
Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it
 (host-79-20-97-182.retail.telecomitalia.it. [79.20.97.182])
 by smtp.gmail.com with ESMTPSA id
 ga33-20020a1709070c2100b0099e12a49c8fsm872183ejc.173.2023.11.11.02.42.38
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 11 Nov 2023 02:42:39 -0800 (PST)
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: linux-amarula@amarulasolutions.com,
 Dario Binacchi <dario.binacchi@amarulasolutions.com>,
 Fabio Estevam <festevam@gmail.com>, Helge Deller <deller@gmx.de>,
 NXP Linux Team <linux-imx@nxp.com>,
 Pengutronix Kernel Team <kernel@pengutronix.de>,
 Sascha Hauer <s.hauer@pengutronix.de>, Shawn Guo <shawnguo@kernel.org>,
 dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org,
 linux-fbdev@vger.kernel.org
Subject: [PATCH 03/10] fbdev: imxfb: use BIT,
 FIELD_{GET,PREP} and GENMASK macros
Date: Sat, 11 Nov 2023 11:41:52 +0100
Message-ID: <20231111104225.136512-4-dario.binacchi@amarulasolutions.com>
X-Mailer: git-send-email 2.42.0
In-Reply-To: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
References: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
Precedence: bulk
X-Mailing-List: linux-fbdev@vger.kernel.org
List-Id: <linux-fbdev.vger.kernel.org>
List-Subscribe: <mailto:linux-fbdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-fbdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0

Replace opencoded masking and shifting, with BIT(), GENMASK(),
FIELD_GET() and FIELD_PREP() macros.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

 drivers/video/fbdev/imxfb.c | 113 +++++++++++++++++++-----------------
 1 file changed, 59 insertions(+), 54 deletions(-)

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index 6af5f09d9c85..b7ef43a7930a 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -34,6 +34,7 @@
 #include <linux/math64.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/bitfield.h>
 
 #include <linux/regulator/consumer.h>
 
@@ -58,48 +59,49 @@ struct imx_fb_videomode {
 #define LCDC_SSA	0x00
 
 #define LCDC_SIZE	0x04
-#define SIZE_XMAX(x)	((((x) >> 4) & 0x3f) << 20)
+#define SIZE_XMAX_MASK	GENMASK(25, 20)
 
-#define YMAX_MASK_IMX1	0x1ff
-#define YMAX_MASK_IMX21	0x3ff
+#define YMAX_MASK_IMX1	GENMASK(8, 0)
+#define YMAX_MASK_IMX21	GENMASK(9, 0)
 
 #define LCDC_VPW	0x08
-#define VPW_VPW(x)	((x) & 0x3ff)
+#define VPW_VPW_MASK	GENMASK(9, 0)
 
 #define LCDC_CPOS	0x0C
-#define CPOS_CC1	(1<<31)
-#define CPOS_CC0	(1<<30)
-#define CPOS_OP		(1<<28)
-#define CPOS_CXP(x)	(((x) & 3ff) << 16)
+#define CPOS_CC1	BIT(31)
+#define CPOS_CC0	BIT(30)
+#define CPOS_OP		BIT(28)
+#define CPOS_CXP_MASK	GENMASK(25, 16)
 
 #define LCDC_LCWHB	0x10
-#define LCWHB_BK_EN	(1<<31)
-#define LCWHB_CW(w)	(((w) & 0x1f) << 24)
-#define LCWHB_CH(h)	(((h) & 0x1f) << 16)
-#define LCWHB_BD(x)	((x) & 0xff)
+#define LCWHB_BK_EN	BIT(31)
+#define LCWHB_CW_MASK	GENMASK(28, 24)
+#define LCWHB_CH_MASK	GENMASK(20, 16)
+#define LCWHB_BD_MASK	GENMASK(7, 0)
 
 #define LCDC_LCHCC	0x14
 
 #define LCDC_PCR	0x18
-#define PCR_TFT		(1 << 31)
-#define PCR_COLOR	(1 << 30)
-#define PCR_BPIX_8	(3 << 25)
-#define PCR_BPIX_12	(4 << 25)
-#define PCR_BPIX_16	(5 << 25)
-#define PCR_BPIX_18	(6 << 25)
+#define PCR_TFT		BIT(31)
+#define PCR_COLOR	BIT(30)
+#define PCR_BPIX_MASK	GENMASK(27, 25)
+#define PCR_BPIX_8	3
+#define PCR_BPIX_12	4
+#define PCR_BPIX_16	5
+#define PCR_BPIX_18	6
 
 #define LCDC_HCR	0x1C
-#define HCR_H_WIDTH(x)	(((x) & 0x3f) << 26)
-#define HCR_H_WAIT_1(x)	(((x) & 0xff) << 8)
-#define HCR_H_WAIT_2(x)	((x) & 0xff)
+#define HCR_H_WIDTH_MASK	GENMASK(31, 26)
+#define HCR_H_WAIT_1_MASK	GENMASK(15, 8)
+#define HCR_H_WAIT_2_MASK	GENMASK(7, 0)
 
 #define LCDC_VCR	0x20
-#define VCR_V_WIDTH(x)	(((x) & 0x3f) << 26)
-#define VCR_V_WAIT_1(x)	(((x) & 0xff) << 8)
-#define VCR_V_WAIT_2(x)	((x) & 0xff)
+#define VCR_V_WIDTH_MASK	GENMASK(31, 26)
+#define VCR_V_WAIT_1_MASK	GENMASK(15, 8)
+#define VCR_V_WAIT_2_MASK	GENMASK(7, 0)
 
 #define LCDC_POS	0x24
-#define POS_POS(x)	((x) & 1f)
+#define POS_POS_MASK	GENMASK(4, 0)
 
 #define LCDC_LSCR1	0x28
 /* bit fields in imxfb.h */
@@ -112,24 +114,24 @@ struct imx_fb_videomode {
 
 #define LCDC_RMCR	0x34
 
-#define RMCR_LCDC_EN_MX1	(1<<1)
+#define RMCR_LCDC_EN_MX1	BIT(1)
 
-#define RMCR_SELF_REF	(1<<0)
+#define RMCR_SELF_REF	BIT(0)
 
 #define LCDC_LCDICR	0x38
-#define LCDICR_INT_SYN	(1<<2)
-#define LCDICR_INT_CON	(1)
+#define LCDICR_INT_SYN	BIT(2)
+#define LCDICR_INT_CON	BIT(0)
 
 #define LCDC_LCDISR	0x40
-#define LCDISR_UDR_ERR	(1<<3)
-#define LCDISR_ERR_RES	(1<<2)
-#define LCDISR_EOF	(1<<1)
-#define LCDISR_BOF	(1<<0)
+#define LCDISR_UDR_ERR	BIT(3)
+#define LCDISR_ERR_RES	BIT(2)
+#define LCDISR_EOF	BIT(1)
+#define LCDISR_BOF	BIT(0)
 
 #define IMXFB_LSCR1_DEFAULT 0x00120300
 
 #define LCDC_LAUSCR	0x80
-#define LAUSCR_AUS_MODE	(1<<31)
+#define LAUSCR_AUS_MODE	BIT(31)
 
 /* Used fb-mode. Can be set on kernel command line, therefore file-static. */
 static const char *fb_mode;
@@ -420,15 +422,15 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
 	switch (var->bits_per_pixel) {
 	case 32:
-		pcr |= PCR_BPIX_18;
+		pcr |= FIELD_PREP(PCR_BPIX_MASK, PCR_BPIX_18);
 		rgb = &def_rgb_18;
 		break;
 	case 16:
 	default:
 		if (is_imx1_fb(fbi))
-			pcr |= PCR_BPIX_12;
+			pcr |= FIELD_PREP(PCR_BPIX_MASK, PCR_BPIX_12);
 		else
-			pcr |= PCR_BPIX_16;
+			pcr |= FIELD_PREP(PCR_BPIX_MASK, PCR_BPIX_16);
 
 		if (imxfb_mode->pcr & PCR_TFT)
 			rgb = &def_rgb_16_tft;
@@ -436,7 +438,7 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 			rgb = &def_rgb_16_stn;
 		break;
 	case 8:
-		pcr |= PCR_BPIX_8;
+		pcr |= FIELD_PREP(PCR_BPIX_MASK, PCR_BPIX_8);
 		rgb = &def_rgb_8;
 		break;
 	}
@@ -520,7 +522,7 @@ static int imxfb_enable_controller(struct imxfb_info *fbi)
 	writel(fbi->map_dma, fbi->regs + LCDC_SSA);
 
 	/* panning offset 0 (0 pixel offset)        */
-	writel(0x00000000, fbi->regs + LCDC_POS);
+	writel(FIELD_PREP(POS_POS_MASK, 0), fbi->regs + LCDC_POS);
 
 	/* disable hardware cursor */
 	writel(readl(fbi->regs + LCDC_CPOS) & ~(CPOS_CC0 | CPOS_CC1),
@@ -654,21 +656,24 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
 #endif
 
 	/* physical screen start address	    */
-	writel(VPW_VPW(var->xres * var->bits_per_pixel / 8 / 4),
-		fbi->regs + LCDC_VPW);
-
-	writel(HCR_H_WIDTH(var->hsync_len - 1) |
-		HCR_H_WAIT_1(var->right_margin - 1) |
-		HCR_H_WAIT_2(var->left_margin - left_margin_low),
-		fbi->regs + LCDC_HCR);
-
-	writel(VCR_V_WIDTH(var->vsync_len) |
-		VCR_V_WAIT_1(var->lower_margin) |
-		VCR_V_WAIT_2(var->upper_margin),
-		fbi->regs + LCDC_VCR);
-
-	writel(SIZE_XMAX(var->xres) | (var->yres & ymax_mask),
-			fbi->regs + LCDC_SIZE);
+	writel(FIELD_PREP(VPW_VPW_MASK,
+			  var->xres * var->bits_per_pixel / 8 / 4),
+	       fbi->regs + LCDC_VPW);
+
+	writel(FIELD_PREP(HCR_H_WIDTH_MASK, var->hsync_len - 1) |
+	       FIELD_PREP(HCR_H_WAIT_1_MASK, var->right_margin - 1) |
+	       FIELD_PREP(HCR_H_WAIT_2_MASK,
+			  var->left_margin - left_margin_low),
+	       fbi->regs + LCDC_HCR);
+
+	writel(FIELD_PREP(VCR_V_WIDTH_MASK, var->vsync_len) |
+	       FIELD_PREP(VCR_V_WAIT_1_MASK, var->lower_margin) |
+	       FIELD_PREP(VCR_V_WAIT_2_MASK, var->upper_margin),
+	       fbi->regs + LCDC_VCR);
+
+	writel(FIELD_PREP(SIZE_XMAX_MASK, var->xres >> 4) |
+	       (var->yres & ymax_mask),
+	       fbi->regs + LCDC_SIZE);
 
 	writel(fbi->pcr, fbi->regs + LCDC_PCR);
 	if (fbi->pwmr)

From patchwork Sat Nov 11 10:41:53 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dario Binacchi <dario.binacchi@amarulasolutions.com>
X-Patchwork-Id: 743207
Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net
 [23.128.96.19])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4021B12B7D
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 10:42:44 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 dkim=pass (1024-bit key) header.d=amarulasolutions.com
 header.i=@amarulasolutions.com header.b="j9/uP+Xd"
Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com
 [IPv6:2a00:1450:4864:20::629])
 by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EEE733C05
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 02:42:42 -0800 (PST)
Received: by mail-ej1-x629.google.com with SMTP id
 a640c23a62f3a-9e5dd91b0acso267640266b.1
 for <linux-fbdev@vger.kernel.org>;
 Sat, 11 Nov 2023 02:42:42 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=amarulasolutions.com; s=google; t=1699699361; x=1700304161;
 darn=vger.kernel.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=ZuBW6agG70lIoCkGnVCWEFfcl6uwNB9B1+pa2Yxc8Go=;
 b=j9/uP+Xdw1Pq1sOD1h6jzT5RhRDbh7QbdYHMsw0DFpoZJwoJziQuHef1h0jrjFE5O1
 WjTyTx93aPwRDuSOGHMq/qIRSEQUQOSX0FT8FN7o3TEEwNMqp+hVKAuUdAMbRJL2g5LJ
 qWjxsbHnyCLi610M+A9iCZdBac+AZ/WG/hXQU=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1699699361; x=1700304161;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=ZuBW6agG70lIoCkGnVCWEFfcl6uwNB9B1+pa2Yxc8Go=;
 b=b53ZC+OoSbzF8DKp6rmX4nhzacVP43euTVi+K+X5MdHK3jWkpZcimXBLFUVLRviZeH
 MMRneWic4dyHzUxdhxOT2t58jrbNqs7iTVDah7N1BsfG28m+Vhhcl1Szro+Cg8CvtOQ7
 IvLcQfOz/4BLUXs0NWoKYGeQgxlbvvW+Z6dUAbydPRuvlxrVKvMXg3+bPc2UccXxq5tV
 6S0vyNsjuwUHy69HIWcAkqmUOwK0QAshJNJM6fRucuFwz8iNNX90WOOzDnyScMSr/Adf
 r3FAhxNhiHz0cViJ0RY/vvg0kNarFSgWWJrRl5kG/e92gsvWzXRy+AI01QdejbQq4+3Z
 J8fQ==
X-Gm-Message-State: AOJu0YyHHiVk7fiRKWvypg+bLQztKisUhG2ODL8YEslHPbxtxNGPqFTv
 NbOFMGc1SCGrJrv7J+4qLBsLSg==
X-Google-Smtp-Source: AGHT+IFbVhFnBfDEfeThETUmx79l/FqCUdUKdBP1kZUSVO8UVeOwurpqW+LCgtJFLlAn08avd0DyXw==
X-Received: by 2002:a17:906:3c9:b0:9e6:59d5:7a86 with SMTP id
 c9-20020a17090603c900b009e659d57a86mr915376eja.57.1699699361285;
 Sat, 11 Nov 2023 02:42:41 -0800 (PST)
Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it
 (host-79-20-97-182.retail.telecomitalia.it. [79.20.97.182])
 by smtp.gmail.com with ESMTPSA id
 ga33-20020a1709070c2100b0099e12a49c8fsm872183ejc.173.2023.11.11.02.42.40
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 11 Nov 2023 02:42:41 -0800 (PST)
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: linux-amarula@amarulasolutions.com,
 Dario Binacchi <dario.binacchi@amarulasolutions.com>,
 Fabio Estevam <festevam@gmail.com>, Helge Deller <deller@gmx.de>,
 NXP Linux Team <linux-imx@nxp.com>,
 Pengutronix Kernel Team <kernel@pengutronix.de>,
 Sascha Hauer <s.hauer@pengutronix.de>, Shawn Guo <shawnguo@kernel.org>,
 dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org,
 linux-fbdev@vger.kernel.org
Subject: [PATCH 04/10] fbdev: imxfb: replace some magic numbers with constants
Date: Sat, 11 Nov 2023 11:41:53 +0100
Message-ID: <20231111104225.136512-5-dario.binacchi@amarulasolutions.com>
X-Mailer: git-send-email 2.42.0
In-Reply-To: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
References: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
Precedence: bulk
X-Mailing-List: linux-fbdev@vger.kernel.org
List-Id: <linux-fbdev.vger.kernel.org>
List-Subscribe: <mailto:linux-fbdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-fbdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0

The patch gets rid of magic numbers replacing them with appropriate
macros.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

 drivers/video/fbdev/imxfb.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index b7ef43a7930a..485e57fa9389 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -89,6 +89,7 @@ struct imx_fb_videomode {
 #define PCR_BPIX_12	4
 #define PCR_BPIX_16	5
 #define PCR_BPIX_18	6
+#define PCR_PCD_MASK	GENMASK(5, 0)
 
 #define LCDC_HCR	0x1C
 #define HCR_H_WIDTH_MASK	GENMASK(31, 26)
@@ -414,8 +415,8 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
 	pcr = (unsigned int)tmp;
 
-	if (--pcr > 0x3F) {
-		pcr = 0x3F;
+	if (--pcr > PCR_PCD_MASK) {
+		pcr = PCR_PCD_MASK;
 		printk(KERN_WARNING "Must limit pixel clock to %luHz\n",
 				lcd_clk / pcr);
 	}
@@ -444,7 +445,7 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 	}
 
 	/* add sync polarities */
-	pcr |= imxfb_mode->pcr & ~(0x3f | (7 << 25));
+	pcr |= imxfb_mode->pcr & ~(PCR_PCD_MASK | PCR_BPIX_MASK);
 
 	fbi->pcr = pcr;
 	/*

From patchwork Sat Nov 11 10:41:54 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dario Binacchi <dario.binacchi@amarulasolutions.com>
X-Patchwork-Id: 743206
Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net
 [23.128.96.19])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9692D12B7D
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 10:42:46 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 dkim=pass (1024-bit key) header.d=amarulasolutions.com
 header.i=@amarulasolutions.com header.b="GrCfM2er"
Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com
 [IPv6:2a00:1450:4864:20::642])
 by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDA7A4228
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 02:42:44 -0800 (PST)
Received: by mail-ej1-x642.google.com with SMTP id
 a640c23a62f3a-9be02fcf268so441630066b.3
 for <linux-fbdev@vger.kernel.org>;
 Sat, 11 Nov 2023 02:42:44 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=amarulasolutions.com; s=google; t=1699699363; x=1700304163;
 darn=vger.kernel.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=VfR080tdra7BLhUIWSvcaEDMSQNVyZv5MjwAaJaquw0=;
 b=GrCfM2erwPgk4/3+nyPnjZ2JFTv3Wwvd+P8cfyzcebe4TdbGQuwMOCiL2NeTI/cPZn
 HntLgdH0GyHiyjjlgnFbRK1YPaxn8YeRBiiYwIOCJgXuYnCl12mTsX2sEWy1vCWl5g5B
 dSN2gymXCMVjLelNQ55s8bWQTTUCeLODdZvkw=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1699699363; x=1700304163;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=VfR080tdra7BLhUIWSvcaEDMSQNVyZv5MjwAaJaquw0=;
 b=pkFgOSbiip3vsAiPEXS5C4CTLd3QrD22M2aCmQfosaDNz7lcNtATV1zJHmRW8oh5sw
 cNcNpnLT7c7G4Go1zldqjOHXfRJBpREWh2gQ7ds5A65JT3pz6ZiwRTLo4X4KKVSF2nuH
 XomDpx3/MQ4YFLI4zF6Vb5Qcjm/lj24uirq00sTxCm1TODMkPqwuH6WsXu/LnZPMd1bk
 af8BRuyJax1F4wGyIgLuYEvbZVHARV8K6fcqqwQiTn/YnsD7qabZ0lzam6HWaCplykZT
 WNIgFfnmbn4JL3svyMBaEqjgN6OlwqB/uPP62aMY39rL/tkFlTEVeniC34Kt9aZnQiEX
 P3HA==
X-Gm-Message-State: AOJu0Yx684Vhxfc4ALtdFNGWuho8mRZ1Y0OXCXSEiPmp66dFLt4DwMBX
 b2TBNajivaL2dvhFu1BRg8YxIg==
X-Google-Smtp-Source: AGHT+IERVItiW0QNcc7Itc1tQ63vCmzWRiYW8aKUXkxzrDZclJWRXQE4ZuhMCcTgFOSgvNri9tEQNA==
X-Received: by 2002:a17:906:32d9:b0:9cc:97b:5a15 with SMTP id
 k25-20020a17090632d900b009cc097b5a15mr963727ejk.64.1699699362713;
 Sat, 11 Nov 2023 02:42:42 -0800 (PST)
Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it
 (host-79-20-97-182.retail.telecomitalia.it. [79.20.97.182])
 by smtp.gmail.com with ESMTPSA id
 ga33-20020a1709070c2100b0099e12a49c8fsm872183ejc.173.2023.11.11.02.42.41
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 11 Nov 2023 02:42:42 -0800 (PST)
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: linux-amarula@amarulasolutions.com,
 Dario Binacchi <dario.binacchi@amarulasolutions.com>,
 Fabio Estevam <festevam@gmail.com>, Helge Deller <deller@gmx.de>,
 NXP Linux Team <linux-imx@nxp.com>,
 Pengutronix Kernel Team <kernel@pengutronix.de>,
 Sascha Hauer <s.hauer@pengutronix.de>, Shawn Guo <shawnguo@kernel.org>,
 dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org,
 linux-fbdev@vger.kernel.org
Subject: [PATCH 05/10] fbdev: imxfb: add missing SPDX tag
Date: Sat, 11 Nov 2023 11:41:54 +0100
Message-ID: <20231111104225.136512-6-dario.binacchi@amarulasolutions.com>
X-Mailer: git-send-email 2.42.0
In-Reply-To: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
References: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
Precedence: bulk
X-Mailing-List: linux-fbdev@vger.kernel.org
List-Id: <linux-fbdev.vger.kernel.org>
List-Subscribe: <mailto:linux-fbdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-fbdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0

Resolve the following warning reported by checkpatch.pl:

WARNING: Missing or malformed SPDX-License-Identifier tag in line 1

The patch also removes some license info made redundant by the addition
of the SPDX tag.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

 drivers/video/fbdev/imxfb.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index 485e57fa9389..de1434069530 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  Freescale i.MX Frame Buffer device driver
  *
  *  Copyright (C) 2004 Sascha Hauer, Pengutronix
  *   Based on acornfb.c Copyright (C) Russell King.
  *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive for
- * more details.
- *
  * Please direct your questions and comments on this driver to the following
  * email address:
  *

From patchwork Sat Nov 11 10:41:55 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dario Binacchi <dario.binacchi@amarulasolutions.com>
X-Patchwork-Id: 744257
Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net
 [23.128.96.19])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by smtp.subspace.kernel.org (Postfix) with ESMTPS id C954312B74
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 10:42:46 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 dkim=pass (1024-bit key) header.d=amarulasolutions.com
 header.i=@amarulasolutions.com header.b="DJl/s2fu"
Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com
 [IPv6:2a00:1450:4864:20::631])
 by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A56C644B6
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 02:42:45 -0800 (PST)
Received: by mail-ej1-x631.google.com with SMTP id
 a640c23a62f3a-9becde9ea7bso812716866b.0
 for <linux-fbdev@vger.kernel.org>;
 Sat, 11 Nov 2023 02:42:45 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=amarulasolutions.com; s=google; t=1699699364; x=1700304164;
 darn=vger.kernel.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=gKRsMdTRp52wX/RfOne0bAjVlYqKCb2FkmXxuvgSsdI=;
 b=DJl/s2fuQIIcozKl54nfpJuDneZJxL4Lrr891YmgCslA9lVF/SYCZuK9pailC1wRRN
 lWc5XmA2AXfltpSjbNB+UWIwer9WItEtSxZH6uOP1/jQ77Bl2hhTjoNTA4xWfxOxsOaH
 WVBDYizY2Z52is4+NnEpgxNxTlF9WfSXCVWCA=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1699699364; x=1700304164;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=gKRsMdTRp52wX/RfOne0bAjVlYqKCb2FkmXxuvgSsdI=;
 b=qqKhjWb5qQ0x2TMyhBbZG9ruE4vuMxgZIID/XDa5V6REz2rUu9XrPhZxsEWqM8uqt5
 pg7kTEuBLzAollwUpjAYTDxPNkEhxr9W2JMJBqLbJ1CmbBFEqAt7xBoe2BKIA//9Dwn1
 7Pro3ME7S+BXehSkgvpvLnSAauFhtQ+tedhE5CUPPNJwyFuQRvUVPfK/HjzYmKRtFTFE
 RcHwGPz1i3lvzq5Osn7x827o+cByvxQiorjNxawHLGRhZRzJ6jigQCUqFh31BoqCpRdf
 sz65k6Pu4m7YOFBd6qBA0Wb2RzT8/C2z1OvoRbJ3mHDGD6eZdoAGbN+CfFCbQw6vojQE
 ol8Q==
X-Gm-Message-State: AOJu0YyxQchcir/gZ6xHmpydYWkBdQVeOoVDLERiS/XWQfLHnJ1rmfVt
 yGAcPw95nhFGOVgmeDaOrrwAzg==
X-Google-Smtp-Source: AGHT+IEJbLdVs0JW+jcGlc8xPQxdZhfaKGnEyX/Ga6OBU0qyC2zAkwbXYZvVAliT6vWUL6mEDi9zyw==
X-Received: by 2002:a17:906:4e4d:b0:9ba:8ed:ea58 with SMTP id
 g13-20020a1709064e4d00b009ba08edea58mr1653246ejw.30.1699699364258;
 Sat, 11 Nov 2023 02:42:44 -0800 (PST)
Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it
 (host-79-20-97-182.retail.telecomitalia.it. [79.20.97.182])
 by smtp.gmail.com with ESMTPSA id
 ga33-20020a1709070c2100b0099e12a49c8fsm872183ejc.173.2023.11.11.02.42.43
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 11 Nov 2023 02:42:43 -0800 (PST)
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: linux-amarula@amarulasolutions.com,
 Dario Binacchi <dario.binacchi@amarulasolutions.com>,
 Fabio Estevam <festevam@gmail.com>, Helge Deller <deller@gmx.de>,
 NXP Linux Team <linux-imx@nxp.com>,
 Pengutronix Kernel Team <kernel@pengutronix.de>,
 Sascha Hauer <s.hauer@pengutronix.de>, Shawn Guo <shawnguo@kernel.org>,
 dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org,
 linux-fbdev@vger.kernel.org
Subject: [PATCH 06/10] fbdev: imxfb: drop ftrace-like logging
Date: Sat, 11 Nov 2023 11:41:55 +0100
Message-ID: <20231111104225.136512-7-dario.binacchi@amarulasolutions.com>
X-Mailer: git-send-email 2.42.0
In-Reply-To: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
References: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
Precedence: bulk
X-Mailing-List: linux-fbdev@vger.kernel.org
List-Id: <linux-fbdev.vger.kernel.org>
List-Subscribe: <mailto:linux-fbdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-fbdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0

Resolve the following warning reported by checkpatch:

WARNING: Unnecessary ftrace-like logging - prefer using ftrace

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

 drivers/video/fbdev/imxfb.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index de1434069530..83497f6998f1 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -694,8 +694,6 @@ static int imxfb_init_fbinfo(struct platform_device *pdev)
 	struct imxfb_info *fbi = info->par;
 	struct device_node *np;
 
-	pr_debug("%s\n",__func__);
-
 	info->pseudo_palette = devm_kmalloc_array(&pdev->dev, 16,
 						  sizeof(u32), GFP_KERNEL);
 	if (!info->pseudo_palette)

From patchwork Sat Nov 11 10:41:56 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dario Binacchi <dario.binacchi@amarulasolutions.com>
X-Patchwork-Id: 743205
Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net
 [23.128.96.19])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7760312B74
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 10:42:48 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 dkim=pass (1024-bit key) header.d=amarulasolutions.com
 header.i=@amarulasolutions.com header.b="pZLxDQfM"
Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com
 [IPv6:2a00:1450:4864:20::633])
 by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10C723AA6
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 02:42:47 -0800 (PST)
Received: by mail-ej1-x633.google.com with SMTP id
 a640c23a62f3a-9becde9ea7bso812719066b.0
 for <linux-fbdev@vger.kernel.org>;
 Sat, 11 Nov 2023 02:42:46 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=amarulasolutions.com; s=google; t=1699699365; x=1700304165;
 darn=vger.kernel.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=IDgHYbXQcqXOi8pgjjCFs89msy5Cd5Tn06zlqflQDL0=;
 b=pZLxDQfMMPGoJyHV3OuLrZpModlaTSVAMJ6G4Yo/kxPSZnPrMk/VXJwu2ssgffb+/R
 Zj6FZ4L5uFUpR7kJ5+J6jz90hBCKjL8V5+J7y+8ESBStJelNwX3xnNk50kG5mhupnd6j
 kfELC3UYqRTaQ/LRCGjEhrCOrqFVghNwlP2c4=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1699699365; x=1700304165;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=IDgHYbXQcqXOi8pgjjCFs89msy5Cd5Tn06zlqflQDL0=;
 b=RLBXPgf/PF4e3oNn29CvU7wuVen8cIM1irRug/LKecqC4I/YTTmtuhE99i1dbVBTrf
 A5tyDLAQU6eB7um/fQqizGMRJjRuDuAjRDCw+LAZwiCxsLvZiD1jY5F7VMKBjZlXTPNz
 9Fu3Jpf9uMcviIDpvxvyXlC4Zq/SiqKI6q59baiFTzxPyArTt0vI957Ht0gMT5PiKjEA
 TLuAzK5UTnCsfxa5/14xNLZuPfoARnQleQw6rOZt3b/ki2qzd4ugaT8A+a7XICiywQ+5
 7kFYxU7MzWQMLdNPmWXHRXvB9GWkEcjDx84SR6tPCyhqDQaif1YfNK+BEu4S07CZRMH2
 D1Fw==
X-Gm-Message-State: AOJu0Yw0Bgus6qerN8YMTqXJzP0EzpswE44RSXQ0brVohd1ub/K3tCSl
 QN0YWPUU92dltyK5orRL4dD+YQ==
X-Google-Smtp-Source: AGHT+IGWjzXZAnVOpqEeTHo29O9vwepCgThZZ6Cih0GL59Twpo4NVs/EaN2y7j4ks3a/O63PR8CCEA==
X-Received: by 2002:a17:906:80c4:b0:9ae:50ec:bd81 with SMTP id
 a4-20020a17090680c400b009ae50ecbd81mr4311227ejx.21.1699699365597;
 Sat, 11 Nov 2023 02:42:45 -0800 (PST)
Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it
 (host-79-20-97-182.retail.telecomitalia.it. [79.20.97.182])
 by smtp.gmail.com with ESMTPSA id
 ga33-20020a1709070c2100b0099e12a49c8fsm872183ejc.173.2023.11.11.02.42.44
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 11 Nov 2023 02:42:45 -0800 (PST)
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: linux-amarula@amarulasolutions.com,
 Dario Binacchi <dario.binacchi@amarulasolutions.com>,
 Fabio Estevam <festevam@gmail.com>, Helge Deller <deller@gmx.de>,
 NXP Linux Team <linux-imx@nxp.com>,
 Pengutronix Kernel Team <kernel@pengutronix.de>,
 Sascha Hauer <s.hauer@pengutronix.de>, Shawn Guo <shawnguo@kernel.org>,
 dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org,
 linux-fbdev@vger.kernel.org
Subject: [PATCH 07/10] fbdev: imxfb: add missing spaces after ','
Date: Sat, 11 Nov 2023 11:41:56 +0100
Message-ID: <20231111104225.136512-8-dario.binacchi@amarulasolutions.com>
X-Mailer: git-send-email 2.42.0
In-Reply-To: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
References: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
Precedence: bulk
X-Mailing-List: linux-fbdev@vger.kernel.org
List-Id: <linux-fbdev.vger.kernel.org>
List-Subscribe: <mailto:linux-fbdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-fbdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0

Fix the following checkpatch error:

ERROR: space required after that ',' (ctx:VxV)

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

 drivers/video/fbdev/imxfb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index 83497f6998f1..ad293dc44dbb 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -280,10 +280,10 @@ static int imxfb_setpalettereg(u_int regno, u_int red, u_int green, u_int blue,
 	struct imxfb_info *fbi = info->par;
 	u_int val, ret = 1;
 
-#define CNVT_TOHW(val,width) ((((val)<<(width))+0x7FFF-(val))>>16)
+#define CNVT_TOHW(val, width) ((((val)<<(width))+0x7FFF-(val))>>16)
 	if (regno < fbi->palette_size) {
 		val = (CNVT_TOHW(red, 4) << 8) |
-		      (CNVT_TOHW(green,4) << 4) |
+		      (CNVT_TOHW(green, 4) << 4) |
 		      CNVT_TOHW(blue,  4);
 
 		writel(val, fbi->regs + 0x800 + (regno << 2));

From patchwork Sat Nov 11 10:41:57 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dario Binacchi <dario.binacchi@amarulasolutions.com>
X-Patchwork-Id: 744256
Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net
 [23.128.96.19])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA76B12B92
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 10:42:49 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 dkim=pass (1024-bit key) header.d=amarulasolutions.com
 header.i=@amarulasolutions.com header.b="UNBvDhYA"
Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com
 [IPv6:2a00:1450:4864:20::642])
 by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DC064228
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 02:42:48 -0800 (PST)
Received: by mail-ej1-x642.google.com with SMTP id
 a640c23a62f3a-9e1fb7faa9dso458253366b.2
 for <linux-fbdev@vger.kernel.org>;
 Sat, 11 Nov 2023 02:42:48 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=amarulasolutions.com; s=google; t=1699699367; x=1700304167;
 darn=vger.kernel.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=uXZvMG+ePha/xCPPyQSZcW7mIHQVo6pfDhdFQ8Ys4tc=;
 b=UNBvDhYAIRvg6gLaB/0hwwz+OB45vtUOomtc0ASMSf/2BNtOy+ib2yl+sBpspCqFrm
 adlfglJ/YKksfbBEOmmqC9u6aqHUp2Z12RNs5IQ5s34jFhoEXEyBwIvNprrc8IE0JSvg
 IGGYWW9UB1N334JsuA0OcMXucQcGfw+drl+Yw=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1699699367; x=1700304167;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=uXZvMG+ePha/xCPPyQSZcW7mIHQVo6pfDhdFQ8Ys4tc=;
 b=YBxaQHbml8soXXTBQkxNOpmjz0n72fnuNd5s2EKJvFF4s2bOxXP8/6hRxA9eCTU9GS
 YmgxzyidwTS2KbFh3ypfLiuAQQ7LVqdm9TkaMqWiqzJK4jilAB6J2JtqXPfd6vZEnVqf
 UKur6OUFG2oTBqS87VnEKakfrP0IZod+CwiY5eJ31ZPWopqWUSXDQdvUtnY4WjTn2ORg
 TgnIQ1Eb1x+WpcsR+nB8z6molYbUk7nGyHE4LHo9Xb48LECq6faL323Wh4o8GmRbhaoE
 bdKAcB5rvTwe84/1gizMs5tK//UIZJtEKS2Pe+w3d8PBUijKonLL0tU6DwYPKJEigp3p
 +Lkw==
X-Gm-Message-State: AOJu0Yx/Q1XGUvZR2Tq8GH3rV0CeZQMZ8byRt8bqWnWELJgmTGQ0oJuM
 9I0jYf52Id7bDQXNB91DfqkjEQ==
X-Google-Smtp-Source: AGHT+IGJZcFy9OdyadzV+Qr9dejIzMtNTDEhCcEQriAhe7EtSGvFTDpXzYmEJXyYAtgH1pYC278gVQ==
X-Received: by 2002:a17:906:fa9b:b0:9dd:6664:1a3a with SMTP id
 lt27-20020a170906fa9b00b009dd66641a3amr1013488ejb.51.1699699366905;
 Sat, 11 Nov 2023 02:42:46 -0800 (PST)
Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it
 (host-79-20-97-182.retail.telecomitalia.it. [79.20.97.182])
 by smtp.gmail.com with ESMTPSA id
 ga33-20020a1709070c2100b0099e12a49c8fsm872183ejc.173.2023.11.11.02.42.45
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 11 Nov 2023 02:42:46 -0800 (PST)
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: linux-amarula@amarulasolutions.com,
 Dario Binacchi <dario.binacchi@amarulasolutions.com>,
 Fabio Estevam <festevam@gmail.com>, Helge Deller <deller@gmx.de>,
 NXP Linux Team <linux-imx@nxp.com>,
 Pengutronix Kernel Team <kernel@pengutronix.de>,
 Sascha Hauer <s.hauer@pengutronix.de>, Shawn Guo <shawnguo@kernel.org>,
 dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org,
 linux-fbdev@vger.kernel.org
Subject: [PATCH 08/10] fbdev: imxfb: Fix style warnings relating to printk()
Date: Sat, 11 Nov 2023 11:41:57 +0100
Message-ID: <20231111104225.136512-9-dario.binacchi@amarulasolutions.com>
X-Mailer: git-send-email 2.42.0
In-Reply-To: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
References: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
Precedence: bulk
X-Mailing-List: linux-fbdev@vger.kernel.org
List-Id: <linux-fbdev.vger.kernel.org>
List-Subscribe: <mailto:linux-fbdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-fbdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0

Resolve the following warning reported by checkpatch:

WARNING: Prefer [subsystem eg: netdev]_err([subsystem]dev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...

This made it necessary to move the 'fbi->pdev = pdev' setting to the
beginning of the driver's probing.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

 drivers/video/fbdev/imxfb.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index ad293dc44dbb..a0172ff75c46 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -414,8 +414,8 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
 	if (--pcr > PCR_PCD_MASK) {
 		pcr = PCR_PCD_MASK;
-		printk(KERN_WARNING "Must limit pixel clock to %luHz\n",
-				lcd_clk / pcr);
+		dev_warn(&fbi->pdev->dev, "Must limit pixel clock to %luHz\n",
+			 lcd_clk / pcr);
 	}
 
 	switch (var->bits_per_pixel) {
@@ -628,28 +628,28 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
 
 #if DEBUG_VAR
 	if (var->xres < 16        || var->xres > 1024)
-		printk(KERN_ERR "%s: invalid xres %d\n",
+		dev_err(&fbi->pdev->dev, "%s: invalid xres %d\n",
 			info->fix.id, var->xres);
 	if (var->hsync_len < 1    || var->hsync_len > 64)
-		printk(KERN_ERR "%s: invalid hsync_len %d\n",
+		dev_err(&fbi->pdev->dev, "%s: invalid hsync_len %d\n",
 			info->fix.id, var->hsync_len);
 	if (var->left_margin < left_margin_low  || var->left_margin > 255)
-		printk(KERN_ERR "%s: invalid left_margin %d\n",
+		dev_err(&fbi->pdev->dev, "%s: invalid left_margin %d\n",
 			info->fix.id, var->left_margin);
 	if (var->right_margin < 1 || var->right_margin > 255)
-		printk(KERN_ERR "%s: invalid right_margin %d\n",
+		dev_err(&fbi->pdev->dev, "%s: invalid right_margin %d\n",
 			info->fix.id, var->right_margin);
 	if (var->yres < 1 || var->yres > ymax_mask)
-		printk(KERN_ERR "%s: invalid yres %d\n",
+		dev_err(&fbi->pdev->dev, "%s: invalid yres %d\n",
 			info->fix.id, var->yres);
 	if (var->vsync_len > 100)
-		printk(KERN_ERR "%s: invalid vsync_len %d\n",
+		dev_err(&fbi->pdev->dev, "%s: invalid vsync_len %d\n",
 			info->fix.id, var->vsync_len);
 	if (var->upper_margin > 63)
-		printk(KERN_ERR "%s: invalid upper_margin %d\n",
+		dev_err(&fbi->pdev->dev, "%s: invalid upper_margin %d\n",
 			info->fix.id, var->upper_margin);
 	if (var->lower_margin > 255)
-		printk(KERN_ERR "%s: invalid lower_margin %d\n",
+		dev_err(&fbi->pdev->dev, "%s: invalid lower_margin %d\n",
 			info->fix.id, var->lower_margin);
 #endif
 
@@ -701,6 +701,7 @@ static int imxfb_init_fbinfo(struct platform_device *pdev)
 
 	memset(fbi, 0, sizeof(struct imxfb_info));
 
+	fbi->pdev = pdev;
 	fbi->devtype = pdev->id_entry->driver_data;
 
 	strscpy(info->fix.id, IMX_NAME, sizeof(info->fix.id));
@@ -1044,7 +1045,6 @@ static int imxfb_probe(struct platform_device *pdev)
 	lcd->props.max_contrast = 0xff;
 
 	imxfb_enable_controller(fbi);
-	fbi->pdev = pdev;
 
 	return 0;
 

From patchwork Sat Nov 11 10:41:58 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dario Binacchi <dario.binacchi@amarulasolutions.com>
X-Patchwork-Id: 743204
Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net
 [23.128.96.19])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by smtp.subspace.kernel.org (Postfix) with ESMTPS id 274E7125A7
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 10:42:51 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 dkim=pass (1024-bit key) header.d=amarulasolutions.com
 header.i=@amarulasolutions.com header.b="qqa01oJE"
Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com
 [IPv6:2a00:1450:4864:20::631])
 by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C03346A3
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 02:42:49 -0800 (PST)
Received: by mail-ej1-x631.google.com with SMTP id
 a640c23a62f3a-9c53e8b7cf4so454683866b.1
 for <linux-fbdev@vger.kernel.org>;
 Sat, 11 Nov 2023 02:42:49 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=amarulasolutions.com; s=google; t=1699699368; x=1700304168;
 darn=vger.kernel.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=0fPpjqbZXDXnwfpqh3sU0UKiF5sG/PgBCsBX0KBupbI=;
 b=qqa01oJEJHpp9rHoh5vg7Qq1KNdMCp9dlgvZF2IS1Gh2tY56HgjH54JcSQfIoJ0txd
 rieCF/lk+6uM2wQ2U8WhhURh6kTFbCasRFjc4fOCBHCRPUIGw6Z2ir5aXoo/mTLqyPl/
 /Gz5VEeW+XobZguHmXCHMEnK1lLx5uZYEVc+s=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1699699368; x=1700304168;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=0fPpjqbZXDXnwfpqh3sU0UKiF5sG/PgBCsBX0KBupbI=;
 b=wzu45Bli4IaKTBe4m/oOvonRBahpFEjvTD8BAJQ4EDh1+OzjPhyJRy4s8DUJfdPNrL
 Co5bGQWOc4YEqKjdctgG8TilimJ1EeznLuwgV2bP6kOIt5kHPK8OtzZQxh8Vilphx0a9
 RGGeE9bDUYbagXGxno9n+xXfk5ZCfLPab5UidfeMagafjMkO79oZ31pJtiw3ORHFOIdf
 K/JriQX3tv+ditsn7uTdqwvK7H+JkkMQkS8sron69c3k2v/SHPLMpgxca7h5TlHJDw3B
 NdIiiffT9cv6zXLx5Dajk1neFAhYtVjqEIaE3t4YfISWU5pMrdAFfT65s9ahgyK1rRTd
 l8QQ==
X-Gm-Message-State: AOJu0YzsPbMpWqFerK+0dlkChPCR1a0bVIzgxnGDk9MkjnEat4tQuFfe
 beJgvppAa6CCIeE5kmfJkhm0IA==
X-Google-Smtp-Source: AGHT+IHstjBS6znxzWZl5i2bWmEodHYLi43ulh4NK9b9RQW7CPLRH4hNONaMe+WD/i4AMw1LubUCfA==
X-Received: by 2002:a17:906:f247:b0:9d2:bf19:88aa with SMTP id
 gy7-20020a170906f24700b009d2bf1988aamr1056461ejb.59.1699699368178;
 Sat, 11 Nov 2023 02:42:48 -0800 (PST)
Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it
 (host-79-20-97-182.retail.telecomitalia.it. [79.20.97.182])
 by smtp.gmail.com with ESMTPSA id
 ga33-20020a1709070c2100b0099e12a49c8fsm872183ejc.173.2023.11.11.02.42.47
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 11 Nov 2023 02:42:47 -0800 (PST)
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: linux-amarula@amarulasolutions.com,
 Dario Binacchi <dario.binacchi@amarulasolutions.com>,
 Fabio Estevam <festevam@gmail.com>, Helge Deller <deller@gmx.de>,
 NXP Linux Team <linux-imx@nxp.com>,
 Pengutronix Kernel Team <kernel@pengutronix.de>,
 Sascha Hauer <s.hauer@pengutronix.de>, Shawn Guo <shawnguo@kernel.org>,
 dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org,
 linux-fbdev@vger.kernel.org
Subject: [PATCH 09/10] fbdev: imxfb: use __func__ for function name
Date: Sat, 11 Nov 2023 11:41:58 +0100
Message-ID: <20231111104225.136512-10-dario.binacchi@amarulasolutions.com>
X-Mailer: git-send-email 2.42.0
In-Reply-To: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
References: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
Precedence: bulk
X-Mailing-List: linux-fbdev@vger.kernel.org
List-Id: <linux-fbdev.vger.kernel.org>
List-Subscribe: <mailto:linux-fbdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-fbdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0

Resolve the following warning reported by checkpatch:

WARNING: Prefer using '"%s...", __func__' to using 'imxfb_blank', this function's name, in a string

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

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

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index a0172ff75c46..8d6943f0bfca 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -576,7 +576,7 @@ static int imxfb_blank(int blank, struct fb_info *info)
 {
 	struct imxfb_info *fbi = info->par;
 
-	pr_debug("imxfb_blank: blank=%d\n", blank);
+	pr_debug("%s: blank=%d\n", __func__, blank);
 
 	switch (blank) {
 	case FB_BLANK_POWERDOWN:

From patchwork Sat Nov 11 10:41:59 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dario Binacchi <dario.binacchi@amarulasolutions.com>
X-Patchwork-Id: 744255
Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net
 [23.128.96.19])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36ADB125A7
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 10:42:53 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 dkim=pass (1024-bit key) header.d=amarulasolutions.com
 header.i=@amarulasolutions.com header.b="bqRVzsok"
Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com
 [IPv6:2a00:1450:4864:20::62b])
 by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05E9344B8
 for <linux-fbdev@vger.kernel.org>; Sat, 11 Nov 2023 02:42:50 -0800 (PST)
Received: by mail-ej1-x62b.google.com with SMTP id
 a640c23a62f3a-9d2e7726d5bso444814866b.0
 for <linux-fbdev@vger.kernel.org>;
 Sat, 11 Nov 2023 02:42:50 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=amarulasolutions.com; s=google; t=1699699369; x=1700304169;
 darn=vger.kernel.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=57XfclRA1DPTjEGTeta8gbvZTvGhPeSww56J1vwZoGA=;
 b=bqRVzsokysWOjTYqiiyzz63kLTJ12L/yQx9u0AoEXyg3teldFilGzA6jx9bjpv9PCd
 8LHXBX6yxFrCkOVfFOU4DIIT/aM1is3JoeApWBvzi8KYjpdsfavhvdc4gI9WWsM4Aqcm
 yoTOvWWWGCaiJmHWLZ/gZBA+60j2PYWk/w/bQ=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1699699369; x=1700304169;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=57XfclRA1DPTjEGTeta8gbvZTvGhPeSww56J1vwZoGA=;
 b=gAT+W8jNYDd8vpw6LfJK+vuUeTfxXXIZ1P9PjvRaibYrOvODkMwiEdsMK7VcQZp2VD
 PGQmz/SOsPHrJuKV17XoTgrDfRKQUbYwfDIZ6jLfTXPlO43Ax9zFhBIjczBJQGK1zmgz
 C5x/m2MB/MHF76ZEpwkB7Wq09gz3uqI5dS0YgQQV9tOZ1bdm+sKScoH2thNKpQpI1JTL
 bEAMj6fr4BxJVy4iOXPAwUjexy2WOSdRm2zMFqMrv5O8KCIN1HESRtvfIW14DN/3dutM
 9mXRcHCWnCFbVnrzb5TRsizaJpwJicRteSbOqLpXuiCEZSqmfiv4WRfVb89GlbO7Rsgp
 QNlA==
X-Gm-Message-State: AOJu0YzxGmgQMtoaqvRpbbTWU81af8SoXy/nz+6CvgoVrnBhOUuOMrLT
 4GUJwO1nrh4rJc1SwYw4uDbTpA==
X-Google-Smtp-Source: AGHT+IF51sz/9Eym2oiwu4zOU3bpJ1pg92NvUM3b8/mDpd88MUL1wczf210dAwnnzyMpQ5H7XMHxcg==
X-Received: by 2002:a17:906:361a:b0:9dd:bd42:4ec2 with SMTP id
 q26-20020a170906361a00b009ddbd424ec2mr908050ejb.10.1699699369457;
 Sat, 11 Nov 2023 02:42:49 -0800 (PST)
Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it
 (host-79-20-97-182.retail.telecomitalia.it. [79.20.97.182])
 by smtp.gmail.com with ESMTPSA id
 ga33-20020a1709070c2100b0099e12a49c8fsm872183ejc.173.2023.11.11.02.42.48
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 11 Nov 2023 02:42:49 -0800 (PST)
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: linux-amarula@amarulasolutions.com,
 Dario Binacchi <dario.binacchi@amarulasolutions.com>,
 Fabio Estevam <festevam@gmail.com>, Helge Deller <deller@gmx.de>,
 NXP Linux Team <linux-imx@nxp.com>,
 Pengutronix Kernel Team <kernel@pengutronix.de>,
 Sascha Hauer <s.hauer@pengutronix.de>, Shawn Guo <shawnguo@kernel.org>,
 dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org,
 linux-fbdev@vger.kernel.org
Subject: [PATCH 10/10] fbdev: imxfb: add '*/' on a separate line in block
 comment
Date: Sat, 11 Nov 2023 11:41:59 +0100
Message-ID: <20231111104225.136512-11-dario.binacchi@amarulasolutions.com>
X-Mailer: git-send-email 2.42.0
In-Reply-To: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
References: <20231111104225.136512-1-dario.binacchi@amarulasolutions.com>
Precedence: bulk
X-Mailing-List: linux-fbdev@vger.kernel.org
List-Id: <linux-fbdev.vger.kernel.org>
List-Subscribe: <mailto:linux-fbdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-fbdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0

Linux kernel coding style uses '*/' on a separate line at the end of
multi line comments.

Fix block comments by moving '*/' at the end of block comments on a
separate line as reported by checkpatch:

WARNING: Block comments use a trailing */ on a separate line

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

 drivers/video/fbdev/imxfb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index 8d6943f0bfca..a4dbc72f93c3 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -946,8 +946,10 @@ static int imxfb_probe(struct platform_device *pdev)
 	if (ret)
 		goto failed_init;
 
-	/* Calculate maximum bytes used per pixel. In most cases this should
-	 * be the same as m->bpp/8 */
+	/*
+	 * Calculate maximum bytes used per pixel. In most cases this should
+	 * be the same as m->bpp/8
+	 */
 	m = &fbi->mode[0];
 	bytes_per_pixel = (m->bpp + 7) / 8;
 	for (i = 0; i < fbi->num_modes; i++, m++)