From patchwork Tue Sep 15 14:12:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 263912 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=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 148F4C433E2 for ; Tue, 15 Sep 2020 23:41:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C3C7421D95 for ; Tue, 15 Sep 2020 23:41:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600213305; bh=C+g55F/GGrJnaepSvz19rogOIfrb73BvXRpFf5AMRZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mSDqYN4UdUUUhnfGBZhIaIso+yr5u9hNUHtKOZK1ksRexPxTrC6yRtSwXfCTRl4Ul PxBOl15sXeiMPJkR8796XYVoM3EFPFlSyf3x/t05CpbZPv3qOpOkga2ecid+/fihAs P+ZOiB3kizUPR4xMschCppSvDoDzzVOlUGm7x+wM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727414AbgIOXlm (ORCPT ); Tue, 15 Sep 2020 19:41:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:47654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727119AbgIOOem (ORCPT ); Tue, 15 Sep 2020 10:34:42 -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 0E8D121D7F; Tue, 15 Sep 2020 14:15:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600179325; bh=C+g55F/GGrJnaepSvz19rogOIfrb73BvXRpFf5AMRZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uSju0cGnGN5Yt/3rjEd8XB7KOqyj2xhdZpUwe++YmrJrsBOLYXahGJtHXRg5L5HrB 8Z1xjZWtZoBN2XUiNfKiPfts8qUe5AoVF/QcdSQWV/0I+p0KrZaiOqr7fagpzYMkyp MhDoBjWGZ0zftbyrucIQTWez/C2ZOzEqZrAuGgc4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , Sasha Levin Subject: [PATCH 4.19 16/78] arm64: dts: ns2: Fixed QSPI compatible string Date: Tue, 15 Sep 2020 16:12:41 +0200 Message-Id: <20200915140634.374186838@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140633.552502750@linuxfoundation.org> References: <20200915140633.552502750@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 686e0a0c8c61e0e3f55321d0181fece3efd92777 ] The string was incorrectly defined before from least to most specific, swap the compatible strings accordingly. Fixes: ff73917d38a6 ("ARM64: dts: Add QSPI Device Tree node for NS2") Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi index ea854f689fda8..6bfb7bbd264af 100644 --- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi @@ -745,7 +745,7 @@ }; qspi: spi@66470200 { - compatible = "brcm,spi-bcm-qspi", "brcm,spi-ns2-qspi"; + compatible = "brcm,spi-ns2-qspi", "brcm,spi-bcm-qspi"; reg = <0x66470200 0x184>, <0x66470000 0x124>, <0x67017408 0x004>,