Skip to content

Commit b462b0e

Browse files
committed
drm/bridge: samsung-dsim: Use HZ_PER_MHZ macro from units.h
Drop the custom MHZ macro and replace it with HZ_PER_MHZ. Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com> Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de> Link: https://lore.kernel.org/r/20250527-samsung-dsim-v1-2-5be520d84fbb@pengutronix.de Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
1 parent bafc628 commit b462b0e

1 file changed

Lines changed: 12 additions & 14 deletions

File tree

drivers/gpu/drm/bridge/samsung-dsim.c

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <linux/of.h>
2121
#include <linux/phy/phy.h>
2222
#include <linux/platform_device.h>
23+
#include <linux/units.h>
2324

2425
#include <video/mipi_display.h>
2526

@@ -558,10 +559,6 @@ static void samsung_dsim_reset(struct samsung_dsim *dsi)
558559
samsung_dsim_write(dsi, DSIM_SWRST_REG, reset_val);
559560
}
560561

561-
#ifndef MHZ
562-
#define MHZ (1000 * 1000)
563-
#endif
564-
565562
static unsigned long samsung_dsim_pll_find_pms(struct samsung_dsim *dsi,
566563
unsigned long fin,
567564
unsigned long fout,
@@ -575,8 +572,8 @@ static unsigned long samsung_dsim_pll_find_pms(struct samsung_dsim *dsi,
575572
u16 _m, best_m;
576573
u8 _s, best_s;
577574

578-
p_min = DIV_ROUND_UP(fin, (driver_data->pll_fin_max * MHZ));
579-
p_max = fin / (driver_data->pll_fin_min * MHZ);
575+
p_min = DIV_ROUND_UP(fin, (driver_data->pll_fin_max * HZ_PER_MHZ));
576+
p_max = fin / (driver_data->pll_fin_min * HZ_PER_MHZ);
580577

581578
for (_p = p_min; _p <= p_max; ++_p) {
582579
for (_s = 0; _s <= 5; ++_s) {
@@ -591,8 +588,8 @@ static unsigned long samsung_dsim_pll_find_pms(struct samsung_dsim *dsi,
591588

592589
tmp = (u64)_m * fin;
593590
do_div(tmp, _p);
594-
if (tmp < driver_data->min_freq * MHZ ||
595-
tmp > driver_data->max_freq * MHZ)
591+
if (tmp < driver_data->min_freq * HZ_PER_MHZ ||
592+
tmp > driver_data->max_freq * HZ_PER_MHZ)
596593
continue;
597594

598595
tmp = (u64)_m * fin;
@@ -635,7 +632,7 @@ static unsigned long samsung_dsim_set_pll(struct samsung_dsim *dsi,
635632
* limit.
636633
*/
637634
fin = clk_get_rate(clk_get_parent(dsi->pll_clk));
638-
while (fin > driver_data->pll_fin_max * MHZ)
635+
while (fin > driver_data->pll_fin_max * HZ_PER_MHZ)
639636
fin /= 2;
640637
clk_set_rate(dsi->pll_clk, fin);
641638

@@ -661,10 +658,11 @@ static unsigned long samsung_dsim_set_pll(struct samsung_dsim *dsi,
661658

662659
if (driver_data->has_freqband) {
663660
static const unsigned long freq_bands[] = {
664-
100 * MHZ, 120 * MHZ, 160 * MHZ, 200 * MHZ,
665-
270 * MHZ, 320 * MHZ, 390 * MHZ, 450 * MHZ,
666-
510 * MHZ, 560 * MHZ, 640 * MHZ, 690 * MHZ,
667-
770 * MHZ, 870 * MHZ, 950 * MHZ,
661+
100 * HZ_PER_MHZ, 120 * HZ_PER_MHZ, 160 * HZ_PER_MHZ,
662+
200 * HZ_PER_MHZ, 270 * HZ_PER_MHZ, 320 * HZ_PER_MHZ,
663+
390 * HZ_PER_MHZ, 450 * HZ_PER_MHZ, 510 * HZ_PER_MHZ,
664+
560 * HZ_PER_MHZ, 640 * HZ_PER_MHZ, 690 * HZ_PER_MHZ,
665+
770 * HZ_PER_MHZ, 870 * HZ_PER_MHZ, 950 * HZ_PER_MHZ,
668666
};
669667
int band;
670668

@@ -724,7 +722,7 @@ static int samsung_dsim_enable_clock(struct samsung_dsim *dsi)
724722
esc_div = DIV_ROUND_UP(byte_clk, dsi->esc_clk_rate);
725723
esc_clk = byte_clk / esc_div;
726724

727-
if (esc_clk > 20 * MHZ) {
725+
if (esc_clk > 20 * HZ_PER_MHZ) {
728726
++esc_div;
729727
esc_clk = byte_clk / esc_div;
730728
}

0 commit comments

Comments
 (0)