Skip to content

Commit f7754d8

Browse files
Kaustabh Chakrabortydaeinki
authored andcommitted
drm/bridge: samsung-dsim: allow configuring the PLL_STABLE bit
The PLL_STABLE bit of DSIM_DPHY_STATUS is hardcoded to BIT(31), but Exynos7870's DSIM has it in BIT(24) as per downstream kernel sources. In order to support both, move this bit value to the driver data struct and define it for every driver compatible. Reference the value from there instead, in functions wherever required. Signed-off-by: Kaustabh Chakraborty <kauschluss@disroot.org> Signed-off-by: Inki Dae <inki.dae@samsung.com>
1 parent 9aa49c2 commit f7754d8

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#define DSIM_STOP_STATE_DAT(x) (((x) & 0xf) << 0)
3636
#define DSIM_STOP_STATE_CLK BIT(8)
3737
#define DSIM_TX_READY_HS_CLK BIT(10)
38-
#define DSIM_PLL_STABLE BIT(31)
3938

4039
/* DSIM_SWRST */
4140
#define DSIM_FUNCRST BIT(16)
@@ -415,6 +414,7 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = {
415414
.wait_for_reset = 1,
416415
.num_bits_resol = 11,
417416
.video_mode_bit = 25,
417+
.pll_stable_bit = 31,
418418
.esc_clken_bit = 28,
419419
.byte_clken_bit = 24,
420420
.tx_req_hsclk_bit = 31,
@@ -445,6 +445,7 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = {
445445
.wait_for_reset = 1,
446446
.num_bits_resol = 11,
447447
.video_mode_bit = 25,
448+
.pll_stable_bit = 31,
448449
.esc_clken_bit = 28,
449450
.byte_clken_bit = 24,
450451
.tx_req_hsclk_bit = 31,
@@ -473,6 +474,7 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = {
473474
.wait_for_reset = 1,
474475
.num_bits_resol = 11,
475476
.video_mode_bit = 25,
477+
.pll_stable_bit = 31,
476478
.esc_clken_bit = 28,
477479
.byte_clken_bit = 24,
478480
.tx_req_hsclk_bit = 31,
@@ -501,6 +503,7 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = {
501503
.wait_for_reset = 0,
502504
.num_bits_resol = 12,
503505
.video_mode_bit = 25,
506+
.pll_stable_bit = 31,
504507
.esc_clken_bit = 28,
505508
.byte_clken_bit = 24,
506509
.tx_req_hsclk_bit = 31,
@@ -529,6 +532,7 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = {
529532
.wait_for_reset = 1,
530533
.num_bits_resol = 12,
531534
.video_mode_bit = 25,
535+
.pll_stable_bit = 31,
532536
.esc_clken_bit = 28,
533537
.byte_clken_bit = 24,
534538
.tx_req_hsclk_bit = 31,
@@ -557,6 +561,7 @@ static const struct samsung_dsim_driver_data imx8mm_dsi_driver_data = {
557561
.wait_for_reset = 0,
558562
.num_bits_resol = 12,
559563
.video_mode_bit = 25,
564+
.pll_stable_bit = 31,
560565
.esc_clken_bit = 28,
561566
.byte_clken_bit = 24,
562567
.tx_req_hsclk_bit = 31,
@@ -760,7 +765,7 @@ static unsigned long samsung_dsim_set_pll(struct samsung_dsim *dsi,
760765
reg = samsung_dsim_read(dsi, DSIM_STATUS_REG);
761766
else
762767
reg = samsung_dsim_read(dsi, DSIM_LINK_STATUS_REG);
763-
} while ((reg & DSIM_PLL_STABLE) == 0);
768+
} while ((reg & BIT(driver_data->pll_stable_bit)) == 0);
764769

765770
dsi->hs_clock = fout;
766771

include/drm/bridge/samsung-dsim.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ struct samsung_dsim_driver_data {
6565
unsigned int wait_for_reset;
6666
unsigned int num_bits_resol;
6767
unsigned int video_mode_bit;
68+
unsigned int pll_stable_bit;
6869
unsigned int esc_clken_bit;
6970
unsigned int byte_clken_bit;
7071
unsigned int tx_req_hsclk_bit;

0 commit comments

Comments
 (0)