lkml.org 
[lkml]   [2020]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/3] drm: hikey9xx: Fix inconsistent compat string
Date
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+huawei@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Manivannan Sadhasivam <mani@kernel.org>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
Cc: Liwei Cai <cailiwei@hisilicon.com>
Cc: Xinliang Liu <xinliang.liu@linaro.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Chen Feng <puck.chen@hisilicon.com>
Signed-off-by: John Stultz <john.stultz@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
\
 
 \ /
  Last update: 2020-08-20 05:41    [W:2.310 / U:0.276 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site