From patchwork Thu Aug 20 03:39:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 248001 Delivered-To: patches@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp1001160ils; Wed, 19 Aug 2020 20:39:44 -0700 (PDT) X-Received: by 2002:a63:4e56:: with SMTP id o22mr1048589pgl.381.1597894784843; Wed, 19 Aug 2020 20:39:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597894784; cv=none; d=google.com; s=arc-20160816; b=mBL1zvlywy3Kynyq4fg/Zdae5FCtISCV5z3K7oYkGpGWM9z7tfVOybtR2Hz+ohdvPL +T/aXeRunI9BF7vC36mELE6VILMtnUnleTnwRdUvCiVeyIyhVBi8q94gvNIWAMQ3uDfh fExvFDWvaWed4npWsDe7r1RPRuH6oUmYSrkzGYFxTU0P5bdyLGXyolzXbuIWOXIrBXuy Hn+rmVt+mXoU/NNxsYGQ5UINUtPAjbG8rpMOgChRK4MfAuN6JIiq9gbmG3gkBZTNQv5h hW0Ps5b9H6tLjkoRZOWcHuLhiGgnYpYMgvBACOtyDEghT179Qnj94ydc5L2yXRZJfQXo vLFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1Pl5M3ukYq8iQYrf+dpnwbhWHmgNw4KikJbcw2NDFaY=; b=UhBb3OSgZytMzeXx2EMeb/63B5e9qfPC1lbXCdpPDLScggcOx3HHKPg2nE61T7vl4T nI9CZooGhe6bOntg+I4ZxLY382Isiq2lC8pVFsNUM9VkHMeyRPxQIWvPXfOSh7YrPuX1 FvwmVvVDGYlLNWM/9Sf3jcjoOYhQOYGdrhDBcnj+uT+njhc/JNnVjjrHrKSnBTBh2G2+ +0q0ApDBLw+RTgcwebO+ztSWKxqbss4bjlK3U4hlvWH6pjsQpvbRuikQrl5wEqHxX99b 7Z0+exfpSh/MLIkDDngsXC7VtG46Bz0ifIly72Jdaz6oWZJ0YD8kJ0ktjDJxOVeS3twQ UR1A== 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 john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y6sor301576pgy.16.2020.08.19.20.39.44 for (Google Transport Security); Wed, 19 Aug 2020 20:39:44 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vTe4qnU9; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=WpNaPtkgUTYz3mSrKgCvehQ6fhUer6x4re4NnpzsWYIxbZL3y9sP2NXQ2+h9tWFwmG 4UQCE4DSspA9NcuvvA/C/zSUqLMJNcqbtkp27pOD4t8XhVgMud90dTjXZHr8FVFyOEcb pfChqwuMqyGL9sHKIA/Rv/ZPEQrAdVmLOSiTc3I4lGzsrjbnUSKsr1YotAej3UHKiWzb kQkUNgYXim5/wSRv/0VrmyXL3LNGiPPApfeqOYJaAQAfsE892Hcv058jd19cP231IRyW 4RygGGtGad6wukqHOnruHLx8tAP06EdU5jc6z0SQy7n1TAPYe5nADH8FSwD2t1NEUcvf GRYw== X-Gm-Message-State: AOAM533yu/cUg/e+cSpurl5LV1Ys6X0lHY6esHXw8OXSLzlcyHHF7BnN O3HsCa7tDNn6zezjdXFQTe3vA/Ci X-Google-Smtp-Source: ABdhPJw7+wbEcxeGvP6s6ZJ+K9s54oBWBNNce+Q9YhzT/XYIL8Tlrz5uMXzYbvij9iHIj3eAZ0TnWg== X-Received: by 2002:a63:5a1e:: with SMTP id o30mr1131758pgb.62.1597894784312; Wed, 19 Aug 2020 20:39:44 -0700 (PDT) Return-Path: 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: 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(-) -- 2.17.1 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",