drm/msm/mdp5: Update compatible strings for MDSS/MDP5

Introduce new compatible strings for the top level MDSS wrapper device,
and the MDP5 device.

Previously, the "qcom,mdp5" and "qcom,mdss_mdp" compatible strings
were used to match the top level platform_device (which was also tied
to the top level drm_device struct). Now, these strings are used
to match the MDP5 platform device.

Use "qcom,mdss" as the compatible string for top level MDSS device.
This is now used to match the top level platform_device (which is
tied to the drm_device struct).

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
index 174d7e7969fd9b8bee09760796ea8b978803395a..ed7143d35b25d0c3075bdcc652c840f07958ea56 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
@@ -809,12 +809,20 @@ static int mdp5_dev_remove(struct platform_device *pdev)
        return 0;
 }
 
+static const struct of_device_id mdp5_dt_match[] = {
+       { .compatible = "qcom,mdp5", },
+       /* to support downstream DT files */
+       { .compatible = "qcom,mdss_mdp", },
+       {}
+};
+MODULE_DEVICE_TABLE(of, mdp5_dt_match);
+
 static struct platform_driver mdp5_driver = {
        .probe = mdp5_dev_probe,
        .remove = mdp5_dev_remove,
        .driver = {
                .name = "msm_mdp",
-               /* Add a DT match field once we move to new hierarchy */
+               .of_match_table = mdp5_dt_match,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 66371f23cc229b65a2f5aa6addaf7fe316c278f4..435a8f90c290cea08df4640eedf4157e220ae80d 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -992,10 +992,8 @@ static int msm_pdev_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id dt_match[] = {
-       { .compatible = "qcom,mdp4", .data = (void *) 4 },      /* mdp4 */
-       { .compatible = "qcom,mdp5", .data = (void *) 5 },      /* mdp5 */
-       /* to support downstream DT files */
-       { .compatible = "qcom,mdss_mdp", .data = (void *) 5 },  /* mdp5 */
+       { .compatible = "qcom,mdp4", .data = (void *)4 },       /* MDP4 */
+       { .compatible = "qcom,mdss", .data = (void *)5 },       /* MDP5 MDSS */
        {}
 };
 MODULE_DEVICE_TABLE(of, dt_match);