From patchwork Tue Sep 15 14:12:15 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: 264002 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 5B359C433E2 for ; Tue, 15 Sep 2020 14:30:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 17B1E23D24 for ; Tue, 15 Sep 2020 14:30:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600180213; bh=HAZp23Ou+P+rrFXKqLLv5gjdmUUhLgUk2swQ65tFFrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ppjkkI+dtMia9tBfXwGXKq4b5M1mYRnkmaZ7fUBH01XMuKdjUDPwRzk3Mbzmy5GWP Y0Buk5gGWyV2zRhllZrN4tv9hTtAVwqBVV9kMJ0wITWKVvqfHoI919G64/8ZrhlKzl u90Q7aYNgl8axaC6cIuxUeROjgosZKwI/kPrIkEU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726998AbgIOO35 (ORCPT ); Tue, 15 Sep 2020 10:29:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:41427 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726285AbgIOO2n (ORCPT ); Tue, 15 Sep 2020 10:28:43 -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 9C73722581; Tue, 15 Sep 2020 14:20:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600179649; bh=HAZp23Ou+P+rrFXKqLLv5gjdmUUhLgUk2swQ65tFFrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xs0G/6S+/VxBU4fGG0J9rq1gdvUTLvAm98lXqLzrFGAoGjz+DlZdn1FmKTKEqelfI JCtkl3Us35oOje5I9az0ehUnuWffQ9rD7eBd/jjeI5HkiPY7OMkmE+a+RCjYk2EZM6 7D2EWFrebLUkGPEgdo20fzGiz36CNDQ+8HM5zljw= 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.4 033/132] ARM: dts: NSP: Fixed QSPI compatible string Date: Tue, 15 Sep 2020 16:12:15 +0200 Message-Id: <20200915140645.787378066@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140644.037604909@linuxfoundation.org> References: <20200915140644.037604909@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 d1ecc40a954fd0f5e3789b91fa80f15e82284e39 ] The string was incorrectly defined before from least to most specific, swap the compatible strings accordingly. Fixes: 329f98c1974e ("ARM: dts: NSP: Add QSPI nodes to NSPI and bcm958625k DTSes") Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index 418e6b97cb2ec..8615d89fa4690 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -282,7 +282,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>,