From patchwork Tue Sep 15 14:12:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 263935 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=-15.8 required=3.0 tests=BAYES_00,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=unavailable 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 DBFB8C43461 for ; Tue, 15 Sep 2020 23:33:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A14E42078D for ; Tue, 15 Sep 2020 23:33:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600212786; bh=il/EjyE8ltkTqmHaHb6KtVbkNva6/bv9VglAN01ds34=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=I1xYVakD2EFzQPCfv2yhi5f5YSMdofg7lfklqjKVCZ8oEAoptwJ0uYN26uqc7zHKO 2wOqdEN09x24s496y1GiooRcU2hhoMRbKt05sRTEMk6+ZfTN7/X5sS/yF/4/cIi4cK gWfzpaSZpVRseXjPPuon819YRuTe1giBmwl+O8rg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727393AbgIOXcV (ORCPT ); Tue, 15 Sep 2020 19:32:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:47668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727162AbgIOOhh (ORCPT ); Tue, 15 Sep 2020 10:37:37 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 6C0B8223FD; Tue, 15 Sep 2020 14:26:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600180010; bh=il/EjyE8ltkTqmHaHb6KtVbkNva6/bv9VglAN01ds34=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a2Pd2K2VElgiquwZMiLQMoryrWTRVARhVBx/ub9oMPK7MlT7dzbzXwWnstyeJmO/Q wujzIGeG8FcyuXIYweIGsN8K4UxySYAyF9VPoPpIb0+T4BD8FCcMFyoY45K69hHd30 wU0dJSgE48EE9oRef4eRfbuBIY992B0oa7aBYJAg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , Sasha Levin Subject: [PATCH 5.8 055/177] ARM: dts: bcm: HR2: Fixed QSPI compatible string Date: Tue, 15 Sep 2020 16:12:06 +0200 Message-Id: <20200915140656.272480734@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140653.610388773@linuxfoundation.org> References: <20200915140653.610388773@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: Florian Fainelli [ Upstream commit d663186293a818af97c648624bee6c7a59e8218b ] The string was incorrectly defined before from least to most specific, swap the compatible strings accordingly. Fixes: b9099ec754b5 ("ARM: dts: Add Broadcom Hurricane 2 DTS include file") Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm-hr2.dtsi b/arch/arm/boot/dts/bcm-hr2.dtsi index 5e5f5ca3c86f1..bba0e8cd2acbd 100644 --- a/arch/arm/boot/dts/bcm-hr2.dtsi +++ b/arch/arm/boot/dts/bcm-hr2.dtsi @@ -217,7 +217,7 @@ }; qspi: spi@27200 { - compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; + compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi"; reg = <0x027200 0x184>, <0x027000 0x124>, <0x11c408 0x004>,