From patchwork Mon Dec 16 17:47:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 181756 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp4618558och; Mon, 16 Dec 2019 09:55:09 -0800 (PST) X-Google-Smtp-Source: APXvYqzKI5HU2vnzJCURqpWowLot73zoxKoNvjvcXTEp8mvMOqgSNxFY8q4DlcbXWx2u/CV+O4pE X-Received: by 2002:a05:6830:18d7:: with SMTP id v23mr31673170ote.213.1576518909774; Mon, 16 Dec 2019 09:55:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576518909; cv=none; d=google.com; s=arc-20160816; b=gaLegglqp/edZDuJDJ0zfhWB2GjvBF1R9Xn5fEjOLYqbMhbVa3fVdFF955j5VOmYZO iTSP/EsGNEiGy4Tg28EK0k4hy6n++TW1nsUQHV97vbL2B+toCHumOo1Ugt2Jt9OcUWu6 N/JTHlWXbblnlO+I+sC5mGED0JIQug2x1ePrf4P8ltqpSjy1sx1zUJNeh3D7lD8eRXyv zOIa5G92u1fHQp/Grla89c8ZsmL2csdDxx5cjqRy4BYDYmPJfc+lIS/cU1YeBc8z4rBl 89dr++GoRwfM9YtTebkaGHXbSOdHZj/hO07EkEVAsjl9unBk6QCKVk3EBPd4uZuduMno 6rxg== 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=XZ4v1tqX9cXHHAWTJMvDdiz9HgmHUXGJnlvXC/MoM0g=; b=hxg+g8xv1T+JvDM81l0/OQZGyl01CvEnQort/BfTfd1F7LjNEIsnxXsLkdfF9IHeca gWp0mykXec9jAAty5suNkG4aeT4iYtvA+PLshx4azUzJTHjfnnGdpctrBLddp/DC4Lxc RW9TYn2Twz0GmrThIlhhivcBqUTKN8Qwf4bn58jkXqAWIthquMZH4RRBFMbt1weWSntN QA8H6uC4DIE8PIRTFg/A3tddp0CHgSjY3jGNls6C9RbVgbH1tkNsFzC76bkCIItDbNuo qRJsOKZiZPqmqO3YWPgxkiruRVHZURWkq7i4N1nGFuGI9150Oo75nFnLJauca0vWUBZu 7J1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nc18RJx9; 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 g5si10142589otn.232.2019.12.16.09.55.09; Mon, 16 Dec 2019 09:55:09 -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=nc18RJx9; 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 S1727758AbfLPRzI (ORCPT + 27 others); Mon, 16 Dec 2019 12:55:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:51962 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727728AbfLPRzG (ORCPT ); Mon, 16 Dec 2019 12:55:06 -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 9322C205ED; Mon, 16 Dec 2019 17:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576518906; bh=02XFS/OU1KS/UCytUjHWP9OXSM3pQQE2fb1PRIdLJOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nc18RJx9aP3+Jyyxs6wzld7ewxVd4Eb+KMtq48aR/bBiz/4xIRQeYC/96N1EpLDkw bre9vEZoqoKi1ZuiA52BPrB3TT0Bf8LfcRnRLWoEk0uS9XOIdCWy6dlczA10iKUGo3 Gtj+MspTMC9Rf6YN59B2+6iNhWaqQ4NNE+y1lw4A= 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.14 116/267] ARM: dts: sunxi: Fix PMU compatible strings Date: Mon, 16 Dec 2019 18:47:22 +0100 Message-Id: <20191216174903.063059705@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174848.701533383@linuxfoundation.org> References: <20191216174848.701533383@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 eef072a21acca..0bb82d0442a59 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -173,7 +173,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 96bee776e1456..77f04dbdf9967 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -171,7 +171,7 @@ }; pmu { - compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu"; + compatible = "arm,cortex-a7-pmu"; interrupts = , ; };