From patchwork Thu Dec 19 18:32:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 182167 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp859464iln; Thu, 19 Dec 2019 10:44:35 -0800 (PST) X-Google-Smtp-Source: APXvYqzzKL3g4m8CtHYTkZDImVmT3V/4GiQ0eVtTu6B8rSqCmcxJEKY3uS0r/yzjX1HflOrDMivr X-Received: by 2002:a9d:8f1:: with SMTP id 104mr8063142otf.107.1576781075767; Thu, 19 Dec 2019 10:44:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576781075; cv=none; d=google.com; s=arc-20160816; b=NB5hALingcFH0ggRbq6hrpkKqX6bRk5ZSmIhWbmv/ltccCsDhuxyJRK01sN5n23UnQ VbCQBlvfBxr7fEwOhGM0mK2DAYZE0qdkwt0ouftdfIxDicUHvXxr6Z01urMdYLRJjrZA mNg0FTRgZS8UAHUl9pVuSBtCUjKnsz94/oSd0V8e6yggclo/zfyRWvRt0CYh6CjdInGg 4F1DDV207K97bvilfy5JxpXd+VCVpqZQa5rsYgpKrHRnw9EpVJ+pZ4pyihfNbYjwrt9l daW0V7G+0Oqry/eHjdBGJ4y7lcb2jnX4YWNXbPiY1yuryFq96Xib+4/ZO5Y8zfgeHsa5 xzAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OVusCATmcPlaRhsS/xIKhg1VXApxFuTs1KG7i1SGFcg=; b=mu8DIX+Ph4KBevacF6yg/PFZropLh1aXjlCa/rcmWqHxtJid84t+j46AMVNE6bFHf0 GQ8IJj6BB7Fe07+OIFCVETnwdlHWwWO0c1A8YfDLbEeUaQgASe7dRL1Wbb1avn5TmHtf dExeGcLro7tOBqzoJ+zX11+O7euDGAa3okDtfFfpneR+N41iphn0UgqmjQeQrhGeb95t WoEVoQI2/MTnHY30cRuahcrIlfwF0vzRzQvlfDDYOiUeUZWFJWR6zl/hvV2cZ95ZlVE1 UwmHDSbdgHoZ06VQsGjmvqcgFexJkxm7Fg0KGLIvmiw9oJ24Wvs5pLW0p7ss6VCzpw/7 C/tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jJI3eskG; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q126si3470880oia.8.2019.12.19.10.44.35; Thu, 19 Dec 2019 10:44:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jJI3eskG; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728376AbfLSSoe (ORCPT + 14 others); Thu, 19 Dec 2019 13:44:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:36596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729015AbfLSSod (ORCPT ); Thu, 19 Dec 2019 13:44:33 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A078224672; Thu, 19 Dec 2019 18:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781073; bh=V2jUsRlq3Dv+MZnM3Ro+bAzdwMYFMhTFt8fR+Zou3Ss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jJI3eskGr1yI6sogbqMGPcgDpbhtSURXNFtkeTaZp8fSmOPRrhjrL6dUvbNKn3sRa 6KqNLvxu58XEpD3hCP3xw1qwFQ/R/D8fP4l+cXDO7ucxaWs3UK2zrPbnRne9xnf7H4 Jik6chEhmt1yUECeOQsHfSI311bstsc+7rM8/hVg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maxime Ripard , Chen-Yu Tsai , Rob Herring , Will Deacon , Sasha Levin Subject: [PATCH 4.9 070/199] ARM: dts: sunxi: Fix PMU compatible strings Date: Thu, 19 Dec 2019 19:32:32 +0100 Message-Id: <20191219183218.866619677@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183214.629503389@linuxfoundation.org> References: <20191219183214.629503389@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rob Herring [ Upstream commit 5719ac19fc32d892434939c1756c2f9a8322e6ef ] "arm,cortex-a15-pmu" is not a valid fallback compatible string for an Cortex-A7 PMU, so drop it. Cc: Maxime Ripard Cc: Chen-Yu Tsai Signed-off-by: Rob Herring Acked-by: Will Deacon Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index ce1960453a0bb..3bfa79717dfab 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -174,7 +174,7 @@ }; pmu { - compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu"; + compatible = "arm,cortex-a7-pmu"; interrupts = , , , diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 94cf5a1c71723..db5d30598ad66 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -172,7 +172,7 @@ }; pmu { - compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu"; + compatible = "arm,cortex-a7-pmu"; interrupts = , ; };