From patchwork Wed Dec 11 15:05:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 181247 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp920483och; Wed, 11 Dec 2019 07:25:55 -0800 (PST) X-Google-Smtp-Source: APXvYqxSlB5k3CyI3TOjs4423fKLQE4ZrJmSkTKnWOBWUfO4mTyvVDDwetuGEb07YX+qqSjN6fMn X-Received: by 2002:aca:111a:: with SMTP id 26mr2972714oir.145.1576077955144; Wed, 11 Dec 2019 07:25:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576077955; cv=none; d=google.com; s=arc-20160816; b=iLYVJh744sSIf/Kith6SUmE2I6wQ2ff5+c9AshqDRgjkTBAjZwMbFiX5n/+33VMh3/ YDfsB5TDi+zdxopuCqTiADFGkS1s2MxPXhhhpe6LR2j/8rWocjJ3cj7N6OdaKWk91I8D rA5xtnA1SMMSoVGbs4mh0rpAw4wYz1Q5ljZxxv1Fo5pgvL48Lf/LLZ/vhFoLbnD6q+us emMkSvJxbLtgcdtkQtU+Cj2RZJhBgVZZSy324FrHgP5zCf8K0DNqERu3UzJNnlrmVg08 nur9cREnwdnqZ/Glmb8TTA7En4xs98uki4VjvaSYvV1B4/IWejAvejQU2Qf3BkQSYd0U VYLg== 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=DTS1qwqkhjVOeQOM/rLiM/F1GSutW+8ZhZP3esuIVcM=; b=B16cptRsa6YWyXl83eQImGAWk9WMJGe3laUIXKrGFCj7i3xDpPD0QrRWWcoENmzcC0 xW+iR3pWatVVYoGI36rwX/E12S7K3pigCL40TdiGBFrbRAqgOT/4EDbrfV9uq42Oowck Hsqg8UOEPJmasFAjXvZbpkIlp+f6iaiLLn7qYyMGv9h01e7lPS1pBrlpRDlekbgDFJMW kNEXlhsopsSdaDcnhKk8O59/Wo+DCfdar4XBAnCmFJJgn6yeFQ3efkCDWvvHbzpPn1x9 cSy0ZSEGV5B7g6rJZxql0ub1Euz/iyFvbFiOQy8j3uRK8Y0wh4TkZygHdjlhbGKXEYlZ J2Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vbDz181F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 z25si1303201oto.211.2019.12.11.07.25.52; Wed, 11 Dec 2019 07:25:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=vbDz181F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733042AbfLKPZs (ORCPT + 27 others); Wed, 11 Dec 2019 10:25:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:58120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732716AbfLKPZn (ORCPT ); Wed, 11 Dec 2019 10:25:43 -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 E0F4F2173E; Wed, 11 Dec 2019 15:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077942; bh=cZpitACy2KXnabzudAg8l5hYZuEEYB2y4ZV+QDVz0gA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vbDz181FPXVf5MmuIYp78hG7wE2KThSdBwpCL7lzStdMVLXXUm0pdNVn+VJHxQb94 ObtdIvf5xTf9NT+LX8T2DPFwMdADNkT0pdKYeQZChf6VXAEHtfA50ZZZ5wCLyzFGwd aHCmg1z6QvMWhDGqKXVqrsTt8k17VTm4lbgw3YVo= 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.19 192/243] ARM: dts: sunxi: Fix PMU compatible strings Date: Wed, 11 Dec 2019 16:05:54 +0100 Message-Id: <20191211150352.132077034@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 debc0bf22ea3b..76924fa42bbc3 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -201,7 +201,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 73e789a133de1..355619dce7994 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -183,7 +183,7 @@ }; pmu { - compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu"; + compatible = "arm,cortex-a7-pmu"; interrupts = , ; };