Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp939970pxa; Wed, 19 Aug 2020 20:42:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJys6BhHXGtvdi5bpC5UcHWkW+dZgR2tf21AgNKoLhYafotcPwWId14npQh9I5SXUB3XSQPM X-Received: by 2002:aa7:d1cb:: with SMTP id g11mr1079897edp.26.1597894971246; Wed, 19 Aug 2020 20:42:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597894971; cv=none; d=google.com; s=arc-20160816; b=HYxIHEp1/yGjnw9CudZBUV5V7b3RdBcydBNtrKlsTWHJumEtFlWb7oLGaXk3osvOm4 HFBgWPtQxmvLQws/FUFGFWm6hAk5srx9G5AUNRDqALO43tBQkGPJ+GQeAtAjqF387G/Y bsPTw9tzjEmqe7y9KG1lMoB5V1N95NXjRV+J6fy/+45JzH8pKAc7zQlt3eR22VFfkGvo TZsNrjreMNZU3vLm3B+MjK40mqDaZlS6BFaYohLA8U71g/7vB0p8/+AZfCRrkU90LWSx j1pNXh3u4enqiLAVn8zxUqkWYRXGlIi2FUUz6rzA83f7Bx5TqGtCu0XOrLT98wP8T52Y WdNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=1Pl5M3ukYq8iQYrf+dpnwbhWHmgNw4KikJbcw2NDFaY=; b=WeG2H5c7ALohggpNjKqiV1pXVDatwHXpFmGuycNI3APmtfNp4Oeulnvu/cQU6tEx5G IHgCNpjaXz3bDhmiz7Sq0IOSnl99ywipB6zGcWvOiHN3CI0/yoGLjzeWT8VPH6m2fvnP AebliOWCu64rHXgTXMEMoK0w8H9gPSYj8tZra2g8j3SL296WNTYjxTpu+QwFXyOdz4U4 0Kvrv8VZRWJDLPzXIReiTf8yojGIeF952HLkz+FWXo/spPnA24WuDWczZekmybQrAIll 6CBiDBnh9IJlud2pDW522kqOXdEHiMDfrxhvIJ/E5p6dkujrPMs/J41JVtC7vsXLnD36 a+sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vTe4qnU9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c26si607672edy.599.2020.08.19.20.42.27; Wed, 19 Aug 2020 20:42:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vTe4qnU9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726745AbgHTDjq (ORCPT + 99 others); Wed, 19 Aug 2020 23:39:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726698AbgHTDjq (ORCPT ); Wed, 19 Aug 2020 23:39:46 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4941C061757 for ; Wed, 19 Aug 2020 20:39:45 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id u20so390775pfn.0 for ; Wed, 19 Aug 2020 20:39:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1Pl5M3ukYq8iQYrf+dpnwbhWHmgNw4KikJbcw2NDFaY=; b=vTe4qnU9syJCWAEG6DywC43aFT6u9KZAlrNQGmPhdjb381EGy/7CuoAm9utkz4bzrG 4SG+ix3+/d12Nxe5oanUjOKPqMy5JQTG0Au7MQCx6D1b3h5hrYHptueFtC0w8E22GncH DB2Y7zUz/eoUKXh71v8MfxvstgAeMB+V62r5YgLgPyBICXwPYQHT/m3+h1M0Q2csztN0 TCDTkwGAvRaH5KrhuFHXK1EGUaAK2H0SFsB9FNscx4D1VkVetzaiZddED0nXU/abKuOG Nx1wDsfslpX8BT0VVyTmT1fo8OBVjpFGcYyAarNIrOlWcuEFZHuQsf1Q6XNSoIPGiVFP 4XNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1Pl5M3ukYq8iQYrf+dpnwbhWHmgNw4KikJbcw2NDFaY=; b=Zolci5iwDUxyYhArjJqkKlbINTTXZYc8BszlFiwFBsbra8h+fPFzoMM+xNw4uK1Jm7 5dYwLX4C9ZZCJJfGcu+b65QpE6Q3rifvuHTIBadvrMf1cUQTluPOMwzBloYYLn8HG3sv YHA1u6tgDA2rqiXedtjruGPY3vzyar9TvsQ+i01xHJvQ0Vr8On2roy8sWL6lwlw6/QI7 rYf9PBSwr7bVJSm0FlvW8q6HCzSocECBfYTwf8Njh26h+xBNmfzqaHDUGjBncxNEFYif /hZqpdhPYAQL4BKydWmFHUmdAVWM7O+/6/yrsl2Z6RU2kPDwOJ0f/c0RdqLCHVGUjPAJ ysgw== X-Gm-Message-State: AOAM530mm2W6CyC8Z7iuj7Ml9QYe2kG3s+NqmMsvzXowrNgkYbrj8YsF tXo7+alaYV9eEH1cSunQDdm+ebGt0utzcA== X-Received: by 2002:a63:5a1e:: with SMTP id o30mr1131758pgb.62.1597894784312; Wed, 19 Aug 2020 20:39:44 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id h9sm803062pfq.18.2020.08.19.20.39.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 20:39:43 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Mauro Carvalho Chehab , Greg Kroah-Hartman , Manivannan Sadhasivam , dri-devel , Liwei Cai , Xinliang Liu , Laurent Pinchart , Sam Ravnborg , Sumit Semwal , Chen Feng Subject: [PATCH 1/3] drm: hikey9xx: Fix inconsistent compat string Date: Thu, 20 Aug 2020 03:39:39 +0000 Message-Id: <20200820033939.127932-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Greg Kroah-Hartman Cc: Manivannan Sadhasivam Cc: dri-devel Cc: Liwei Cai Cc: Xinliang Liu Cc: Laurent Pinchart Cc: Sam Ravnborg Cc: Sumit Semwal Cc: Chen Feng Signed-off-by: John Stultz --- 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