From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26889C43603 for ; Thu, 19 Dec 2019 18:37:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EFFF920716 for ; Thu, 19 Dec 2019 18:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780633; bh=qyRQK2XNFhzNTl1dttZTfXeag5fD1ibX+yF6N58wdvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vURgbEm22W0iYwIhJmSfkXWfHRlGsjAD3YJhd+W6z2ZQFhWdD5sjKTt89OELqdKLm 7wPh7EgokbvBhEEudsehXKW/ObZK7ooSb+lx3EEAqGctb/hOsDuHpFCxBAKS+Txu35 0+HmOtmEjPks7FHZUIUjLDDePTX+PyVUsb1BY9Ck= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727270AbfLSShL (ORCPT ); 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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(-) 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 = , ; }; -- 2.20.1