From patchwork Thu Dec 19 18:32:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 182157 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp851706iln; Thu, 19 Dec 2019 10:37:13 -0800 (PST) X-Google-Smtp-Source: APXvYqxLudZC2jd6uaUxNWvHZbGiw3/waIWPFLJaPZ9JLM52AhmNEn3XQ65h+FfcV3XpIEJsYarS X-Received: by 2002:a9d:461b:: with SMTP id y27mr11118192ote.280.1576780633075; Thu, 19 Dec 2019 10:37:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576780633; cv=none; d=google.com; s=arc-20160816; b=m3TiqH1rkBcuHTlda9QsQToOf8MkUtYuUhIvFLt3QrfDzVsB8oLNn9x1XE6yp2odSn rJXA+HI/Unv89qOHmJzngqW/7cthKwYEfB1pit3Y2MqtnG0PG0LctDLiKLdVxsqteHt0 e2+0xwDfPG7pkCFu2OZz353Z+bCV0OMew+zWH7rce5zP9BQ+bHCz2HeL/Ty/14CaY87X H97YP49DQJ2bvcGY+2mubdm8n05+N4YybbgCaldsTV8IDbUbvaquQFOhFaMqNIk2peyU XkmGK+GXLDhh3kjRXfNJqDAAatVXxXZ0wkBuJf3KPVi++2XCdb1Yxm/XGLDx4yKJcpTC h65w== 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=Iu6TqCgMd9AIHDzzVfScYSohESVh+aRURvkX6oUa+VY=; b=VbGSyM6bbdg6AC+biFg1CfzmI8x1T51wtibMOBX6punU9B2MgBVsyxyG2hOrPxiw/O jvIofXS938+0AXSkVtIfFY3qFzATCXk6TGOSBVr/Uudb9gTE9RY+gXLPs+q2sGKaZFe7 8MyXafMY+px/iXthxkqSs2PXmKJp+akzXzqQHgG33Q27Zz+TUqNy7PuydbbvgHk8l2eb GmIFJ7Y810rv8h+NH+PYNMsznSuT3EGg2GAQbQ7CWjmsCoEfXU0cAwVlkhTTylAhl+m0 yxpzL3ftpzIWX+d6i03YEdSo7/MWzgzAaJshINiqoX1OefSiSvif2E/Nqok88AwShCuh 7Fag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Njj56N4+; 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 g26si3509643otk.324.2019.12.19.10.37.12; Thu, 19 Dec 2019 10:37:13 -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=Njj56N4+; 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 S1727270AbfLSShL (ORCPT + 14 others); Thu, 19 Dec 2019 13:37:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:54570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727750AbfLSShK (ORCPT ); Thu, 19 Dec 2019 13:37:10 -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 A99DA2467F; Thu, 19 Dec 2019 18:37:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780630; bh=qyRQK2XNFhzNTl1dttZTfXeag5fD1ibX+yF6N58wdvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Njj56N4+tp4l7oN0hL46LGbxammfIuNV+yeeYdy+yM62JO/LromhUncKEgXU1vyXF 0L/P+A0koVGn/EH+WfFlAzzTf93doC8M8zY6LwM3oO1lMaLm1zwgJrMyouLV8WtQCS 7IbC67ML7KAG8je0Dn+Nd57NnOatsnZ1e7ZJPzII= 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.4 052/162] ARM: dts: sunxi: Fix PMU compatible strings Date: Thu, 19 Dec 2019 19:32:40 +0100 Message-Id: <20191219183211.060566900@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@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 b6ad7850fac69..698970d0281f3 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -167,7 +167,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 e02eb720c4fc1..a7b4dbda1a878 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -167,7 +167,7 @@ }; pmu { - compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu"; + compatible = "arm,cortex-a7-pmu"; interrupts = , ; };