Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+12 -14
+12 -14
drivers/gpu/drm/bridge/samsung-dsim.c
··· 20 20 #include <linux/of.h> 21 21 #include <linux/phy/phy.h> 22 22 #include <linux/platform_device.h> 23 + #include <linux/units.h> 23 24 24 25 #include <video/mipi_display.h> 25 26 ··· 559 558 samsung_dsim_write(dsi, DSIM_SWRST_REG, reset_val); 560 559 } 561 560 562 - #ifndef MHZ 563 - #define MHZ (1000 * 1000) 564 - #endif 565 - 566 561 static unsigned long samsung_dsim_pll_find_pms(struct samsung_dsim *dsi, 567 562 unsigned long fin, 568 563 unsigned long fout, ··· 572 575 u16 _m, best_m; 573 576 u8 _s, best_s; 574 577 575 - p_min = DIV_ROUND_UP(fin, (driver_data->pll_fin_max * MHZ)); 576 - p_max = fin / (driver_data->pll_fin_min * MHZ); 578 + p_min = DIV_ROUND_UP(fin, (driver_data->pll_fin_max * HZ_PER_MHZ)); 579 + p_max = fin / (driver_data->pll_fin_min * HZ_PER_MHZ); 577 580 578 581 for (_p = p_min; _p <= p_max; ++_p) { 579 582 for (_s = 0; _s <= 5; ++_s) { ··· 588 591 589 592 tmp = (u64)_m * fin; 590 593 do_div(tmp, _p); 591 - if (tmp < driver_data->min_freq * MHZ || 592 - tmp > driver_data->max_freq * MHZ) 594 + if (tmp < driver_data->min_freq * HZ_PER_MHZ || 595 + tmp > driver_data->max_freq * HZ_PER_MHZ) 593 596 continue; 594 597 595 598 tmp = (u64)_m * fin; ··· 632 635 * limit. 633 636 */ 634 637 fin = clk_get_rate(clk_get_parent(dsi->pll_clk)); 635 - while (fin > driver_data->pll_fin_max * MHZ) 638 + while (fin > driver_data->pll_fin_max * HZ_PER_MHZ) 636 639 fin /= 2; 637 640 clk_set_rate(dsi->pll_clk, fin); 638 641 ··· 658 661 659 662 if (driver_data->has_freqband) { 660 663 static const unsigned long freq_bands[] = { 661 - 100 * MHZ, 120 * MHZ, 160 * MHZ, 200 * MHZ, 662 - 270 * MHZ, 320 * MHZ, 390 * MHZ, 450 * MHZ, 663 - 510 * MHZ, 560 * MHZ, 640 * MHZ, 690 * MHZ, 664 - 770 * MHZ, 870 * MHZ, 950 * MHZ, 664 + 100 * HZ_PER_MHZ, 120 * HZ_PER_MHZ, 160 * HZ_PER_MHZ, 665 + 200 * HZ_PER_MHZ, 270 * HZ_PER_MHZ, 320 * HZ_PER_MHZ, 666 + 390 * HZ_PER_MHZ, 450 * HZ_PER_MHZ, 510 * HZ_PER_MHZ, 667 + 560 * HZ_PER_MHZ, 640 * HZ_PER_MHZ, 690 * HZ_PER_MHZ, 668 + 770 * HZ_PER_MHZ, 870 * HZ_PER_MHZ, 950 * HZ_PER_MHZ, 665 669 }; 666 670 int band; 667 671 ··· 722 724 esc_div = DIV_ROUND_UP(byte_clk, dsi->esc_clk_rate); 723 725 esc_clk = byte_clk / esc_div; 724 726 725 - if (esc_clk > 20 * MHZ) { 727 + if (esc_clk > 20 * HZ_PER_MHZ) { 726 728 ++esc_div; 727 729 esc_clk = byte_clk / esc_div; 728 730 }