This is against Mauro's tree here:
https://gitlab.freedesktop.org/mchehab_kernel/hikey-970/-/commits/master/

A previous patch changed this string to be
"hisilicon,kirin960-dpe", but there are other place where the
code still expects "hisilicon,hi3660-dpe", so change it back.

Cc: Mauro Carvalho Chehab <mchehab+hua...@kernel.org>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Cc: Manivannan Sadhasivam <m...@kernel.org>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
Cc: Liwei Cai <caili...@hisilicon.com>
Cc: Xinliang Liu <xinliang....@linaro.org>
Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Cc: Sam Ravnborg <s...@ravnborg.org>
Cc: Sumit Semwal <sumit.sem...@linaro.org>
Cc: Chen Feng <puck.c...@hisilicon.com>
Signed-off-by: John Stultz <john.stu...@linaro.org>
---
 drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c 
b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c
index 18fec5a1b59d..efa5727612f5 100644
--- a/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c
+++ b/drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c
@@ -339,7 +339,7 @@ static int kirin_drm_platform_resume(struct platform_device 
*pdev)
 }
 
 static const struct of_device_id kirin_drm_dt_ids[] = {
-       { .compatible = "hisilicon,kirin960-dpe",
+       { .compatible = "hisilicon,hi3660-dpe",
          .data = &kirin960_dss_dc_ops,
        },
        { .compatible = "hisilicon,kirin970-dpe",
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to