From patchwork Thu Apr 16 13:24:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 227926 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 39BAAC2BB55 for ; Thu, 16 Apr 2020 13:29:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 11746221F4 for ; Thu, 16 Apr 2020 13:29:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587043795; bh=rXkh2aRrbIIG14idHHtgzlWycyi8V8ynYJ10c0RNDbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0Ac828bsElL5nqqp5d/KyKpsSFK7chgD8aw3aq0su28WVe4NyIBKYPrW8nL/Ll0aE iRGfpQLkL8hLUdQewtfn2CN390LGYdNmmHKyjUDLKgffD5sb1sJ8M7Ms9uLgukoQ5R 78h2bv3qWmneCk6UzZlsCwetTXzFlIedPMzPxNXI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2896095AbgDPN3x (ORCPT ); Thu, 16 Apr 2020 09:29:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:39868 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2896093AbgDPN3u (ORCPT ); Thu, 16 Apr 2020 09:29:50 -0400 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 2848821D91; Thu, 16 Apr 2020 13:29:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587043790; bh=rXkh2aRrbIIG14idHHtgzlWycyi8V8ynYJ10c0RNDbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0Ov3kO5HRcjAJg3s9dXN8SFZ+UYtYVsIb+XuvUBv+q2WJpOWffKXY3kq2H3XzOAHU CnenPiZnyc2DhLVEp7nJAeBIbWSmLqauFTKj4W39qnie6bnuaGqgybhI65bJMx6mdM ojyt5sbO2fUa3IYaP2c0HnPkjoTTFDcV/PGd3iIk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maxime Ripard , Guenter Roeck Subject: [PATCH 4.19 101/146] arm64: dts: allwinner: h6: Fix PMU compatible Date: Thu, 16 Apr 2020 15:24:02 +0200 Message-Id: <20200416131256.549627724@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131242.353444678@linuxfoundation.org> References: <20200416131242.353444678@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: Maxime Ripard commit 4c7eeb9af3e41ae7d840977119c58f3bbb3f4f59 upstream. The commit 7aa9b9eb7d6a ("arm64: dts: allwinner: H6: Add PMU mode") introduced support for the PMU found on the Allwinner H6. However, the binding only allows for a single compatible, while the patch was adding two. Make sure we follow the binding. Fixes: 7aa9b9eb7d6a ("arm64: dts: allwinner: H6: Add PMU mode") Signed-off-by: Maxime Ripard Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -70,8 +70,7 @@ }; pmu { - compatible = "arm,cortex-a53-pmu", - "arm,armv8-pmuv3"; + compatible = "arm,cortex-a53-pmu"; interrupts = , , ,