On 14.03.2023 01:07, Marijn Suijten wrote:
> On 2023-03-07 14:01:45, Konrad Dybcio wrote:
>> Now that the only user is handled by common code, remove the option to
>> specify custom handlers through match data.
>>
>> This is effectively a revert of commit:
>> 5ae15e76271 ("drm/msm/dsi: Allow to specify dsi config as pdata")
>
> Would it also be worth to mention something along these lines in the
> previous patch, but for ee1f09678f14 ("drm/msm/dsi: Add support for
> qcm2290 dsi controller")?
50/50, it wouldn't hurt but it doesn't sound groundbreaking to skip it..
Konrad
>
>> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
>> Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
>
> Reviewed-by: Marijn Suijten <marijn.suijten@xxxxxxxxxxxxxx>
>
>> ---
>> drivers/gpu/drm/msm/dsi/dsi.c | 4 ++--
>> drivers/gpu/drm/msm/dsi/dsi_host.c | 4 ----
>> 2 files changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
>> index 90d43628b22b..e0b911af618d 100644
>> --- a/drivers/gpu/drm/msm/dsi/dsi.c
>> +++ b/drivers/gpu/drm/msm/dsi/dsi.c
>> @@ -173,10 +173,10 @@ static int dsi_dev_remove(struct platform_device *pdev)
>> }
>>
>> static const struct of_device_id dt_match[] = {
>> - { .compatible = "qcom,mdss-dsi-ctrl", .data = NULL /* autodetect cfg */ },
>> + { .compatible = "qcom,mdss-dsi-ctrl" },
>>
>> /* Deprecated, don't use */
>> - { .compatible = "qcom,dsi-ctrl-6g-qcm2290", .data = NULL },
>> + { .compatible = "qcom,dsi-ctrl-6g-qcm2290" },
>> {}
>> };
>>
>> diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
>> index 9cfb9e91bfea..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__);
>>
>> --
>> 2.39.2
>>
