diff options
| author | Linaro CI <ci_notify@linaro.org> | 2023-04-09 18:37:05 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2023-04-09 18:37:05 +0000 |
| commit | 4dcf8ee7482335c740273d110acc5f0176cc2a5b (patch) | |
| tree | 03f83da47836c6459c2c3e6947d9518a77768132 /drivers/gpu/drm/msm/dsi/dsi_host.c | |
| parent | 7a7ea046b12372c274cd4600a3a7e245645a757b (diff) | |
| parent | 9a39bdbadcf01035fa85765c18a6fd048c177ba8 (diff) | |
Merge remote-tracking branch 'RB1/tracking-rb1' into integration-linux-qcomltintegration-linux-qcomlt-20230416-224712-v6.3-rc6-326-g4dcf8ee748233
Diffstat (limited to 'drivers/gpu/drm/msm/dsi/dsi_host.c')
| -rw-r--r-- | drivers/gpu/drm/msm/dsi/dsi_host.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index 18fa30e1e858..961689a255c4 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -214,10 +214,6 @@ static const struct msm_dsi_cfg_handler *dsi_get_config( int ret; u32 major = 0, minor = 0; - cfg_hnd = device_get_match_data(dev); - if (cfg_hnd) - return cfg_hnd; - ahb_clk = msm_clk_get(msm_host->pdev, "iface"); if (IS_ERR(ahb_clk)) { pr_err("%s: cannot get interface clock\n", __func__); @@ -1862,16 +1858,16 @@ static int dsi_host_get_id(struct msm_dsi_host *msm_host) struct platform_device *pdev = msm_host->pdev; const struct msm_dsi_config *cfg = msm_host->cfg_hnd->cfg; struct resource *res; - int i; + int i, j; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dsi_ctrl"); if (!res) return -EINVAL; - for (i = 0; i < cfg->num_dsi; i++) { - if (cfg->io_start[i] == res->start) - return i; - } + for (i = 0; i < VARIANTS_MAX; i++) + for (j = 0; j < DSI_MAX; j++) + if (cfg->io_start[i][j] == res->start) + return j; return -EINVAL; } |