From nobody Wed Dec 17 04:12:42 2025
Received: from metis.whiteo.stw.pengutronix.de
 (metis.whiteo.stw.pengutronix.de [185.203.201.7])
	(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 8FBE727603C
	for <linux-kernel@vger.kernel.org>; Tue, 27 May 2025 14:22:09 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 arc=none smtp.client-ip=185.203.201.7
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1748355731; cv=none;
 b=Xze8RXBG1rygRb195zIZv7pAfuhfpn53V80jsBOwN8DYGKv9f6Bk0CXwOwIlbBGEKI+w8s/D/TNpHlaUJ5WQfq4YpsA0E9OVLiU7bIMm++3llCUP7ZsoA8e05m89ud/upRcR1P7nHNnfAAmIbzfwasQuO+qvz6Hs8CBB4HyoFAM=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1748355731; c=relaxed/simple;
	bh=sTLfjTBukU2SRCiKeBwjv6o8LNmKOJIeBM8Hz5UTxdg=;
	h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:
	 In-Reply-To:To:Cc;
 b=HdOYEssc/W8RVrWrVxrbny09Dip0S5LAImW1hrt60XiG4vuu4D1n+KJROpQ+j79+AlQNxjHRKukznr5WhwkbsMWrg8qidcuYUmg2LQdOwmg1auHEajqb949tEpNsmbNhNmyjC93Qbw5LLgRbSuvtgytLLTpdY+otCBdRXEeSH3Q=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
 dmarc=none (p=none dis=none) header.from=pengutronix.de;
 spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7
Authentication-Results: smtp.subspace.kernel.org;
 dmarc=none (p=none dis=none) header.from=pengutronix.de
Authentication-Results: smtp.subspace.kernel.org;
 spf=pass smtp.mailfrom=pengutronix.de
Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54])
	by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <p.zabel@pengutronix.de>)
	id 1uJvBp-00048s-7E; Tue, 27 May 2025 16:22:01 +0200
From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Tue, 27 May 2025 16:21:48 +0200
Subject: [PATCH 2/2] drm/bridge: samsung-dsim: Use HZ_PER_MHZ macro from
 units.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: quoted-printable
Message-Id: <20250527-samsung-dsim-v1-2-5be520d84fbb@pengutronix.de>
References: <20250527-samsung-dsim-v1-0-5be520d84fbb@pengutronix.de>
In-Reply-To: <20250527-samsung-dsim-v1-0-5be520d84fbb@pengutronix.de>
To: Inki Dae <inki.dae@samsung.com>,
 Jagan Teki <jagan@amarulasolutions.com>,
 Marek Szyprowski <m.szyprowski@samsung.com>,
 Andrzej Hajda <andrzej.hajda@intel.com>,
 Neil Armstrong <neil.armstrong@linaro.org>, Robert Foss <rfoss@kernel.org>,
 Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
 Jonas Karlman <jonas@kwiboo.se>, Jernej Skrabec <jernej.skrabec@gmail.com>,
 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,
 kernel@pengutronix.de, Philipp Zabel <p.zabel@pengutronix.de>
X-Mailer: b4 0.14.2
X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::54
X-SA-Exim-Mail-From: p.zabel@pengutronix.de
X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de);
 SAEximRunCond expanded to false
X-PTX-Original-Recipient: linux-kernel@vger.kernel.org

Drop the custom MHZ macro and replace it with HZ_PER_MHZ.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de>
---
 drivers/gpu/drm/bridge/samsung-dsim.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c b/drivers/gpu/drm/bridge=
/samsung-dsim.c
index 1dfc9710bee5134e0e0114ce52f673c21564b11b..b7fd5870eba7e4bef3f420ae7cf=
6de1a700eb41d 100644
--- a/drivers/gpu/drm/bridge/samsung-dsim.c
+++ b/drivers/gpu/drm/bridge/samsung-dsim.c
@@ -19,6 +19,7 @@
 #include <linux/of.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
+#include <linux/units.h>
=20
 #include <video/mipi_display.h>
=20
@@ -557,10 +558,6 @@ static void samsung_dsim_reset(struct samsung_dsim *ds=
i)
 	samsung_dsim_write(dsi, DSIM_SWRST_REG, reset_val);
 }
=20
-#ifndef MHZ
-#define MHZ	(1000 * 1000)
-#endif
-
 static unsigned long samsung_dsim_pll_find_pms(struct samsung_dsim *dsi,
 					       unsigned long fin,
 					       unsigned long fout,
@@ -574,8 +571,8 @@ static unsigned long samsung_dsim_pll_find_pms(struct s=
amsung_dsim *dsi,
 	u16 _m, best_m;
 	u8 _s, best_s;
=20
-	p_min =3D DIV_ROUND_UP(fin, (driver_data->pll_fin_max * MHZ));
-	p_max =3D fin / (driver_data->pll_fin_min * MHZ);
+	p_min =3D DIV_ROUND_UP(fin, (driver_data->pll_fin_max * HZ_PER_MHZ));
+	p_max =3D fin / (driver_data->pll_fin_min * HZ_PER_MHZ);
=20
 	for (_p =3D p_min; _p <=3D p_max; ++_p) {
 		for (_s =3D 0; _s <=3D 5; ++_s) {
@@ -590,8 +587,8 @@ static unsigned long samsung_dsim_pll_find_pms(struct s=
amsung_dsim *dsi,
=20
 			tmp =3D (u64)_m * fin;
 			do_div(tmp, _p);
-			if (tmp < driver_data->min_freq  * MHZ ||
-			    tmp > driver_data->max_freq * MHZ)
+			if (tmp < driver_data->min_freq  * HZ_PER_MHZ ||
+			    tmp > driver_data->max_freq * HZ_PER_MHZ)
 				continue;
=20
 			tmp =3D (u64)_m * fin;
@@ -634,7 +631,7 @@ static unsigned long samsung_dsim_set_pll(struct samsun=
g_dsim *dsi,
 		 * limit.
 		 */
 		fin =3D clk_get_rate(clk_get_parent(dsi->pll_clk));
-		while (fin > driver_data->pll_fin_max * MHZ)
+		while (fin > driver_data->pll_fin_max * HZ_PER_MHZ)
 			fin /=3D 2;
 		clk_set_rate(dsi->pll_clk, fin);
=20
@@ -660,10 +657,11 @@ static unsigned long samsung_dsim_set_pll(struct sams=
ung_dsim *dsi,
=20
 	if (driver_data->has_freqband) {
 		static const unsigned long freq_bands[] =3D {
-			100 * MHZ, 120 * MHZ, 160 * MHZ, 200 * MHZ,
-			270 * MHZ, 320 * MHZ, 390 * MHZ, 450 * MHZ,
-			510 * MHZ, 560 * MHZ, 640 * MHZ, 690 * MHZ,
-			770 * MHZ, 870 * MHZ, 950 * MHZ,
+			100 * HZ_PER_MHZ, 120 * HZ_PER_MHZ, 160 * HZ_PER_MHZ,
+			200 * HZ_PER_MHZ, 270 * HZ_PER_MHZ, 320 * HZ_PER_MHZ,
+			390 * HZ_PER_MHZ, 450 * HZ_PER_MHZ, 510 * HZ_PER_MHZ,
+			560 * HZ_PER_MHZ, 640 * HZ_PER_MHZ, 690 * HZ_PER_MHZ,
+			770 * HZ_PER_MHZ, 870 * HZ_PER_MHZ, 950 * HZ_PER_MHZ,
 		};
 		int band;
=20
@@ -723,7 +721,7 @@ static int samsung_dsim_enable_clock(struct samsung_dsi=
m *dsi)
 	esc_div =3D DIV_ROUND_UP(byte_clk, dsi->esc_clk_rate);
 	esc_clk =3D byte_clk / esc_div;
=20
-	if (esc_clk > 20 * MHZ) {
+	if (esc_clk > 20 * HZ_PER_MHZ) {
 		++esc_div;
 		esc_clk =3D byte_clk / esc_div;
 	}

--=20
2.39.5