From patchwork Mon Sep 21 16:26:54 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: 263573 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=-14.2 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 6E611C43465 for ; Mon, 21 Sep 2020 17:03:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2AFE92073A for ; Mon, 21 Sep 2020 17:03:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600707798; bh=cFOb6X2TH9jpa/vZrkwFVssHoq37dH+POa/lNLMPUHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=I1zch2GAH5jysYyBHxc0h0s5J7ey1gLbyOi96NktZ0aE3Wkd3jllM1qCKN8Xno9P+ yfSSNDqsIh7Q/ub5QY/9QACAJ7naGA0raVJfHYu0ehsuVDbGwdbPpDPSGwmRqFeJ7W lVjK1KmFYdYaXTCq1wgS0FMEcVXcy52BuwIQQug8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730463AbgIURDJ (ORCPT ); Mon, 21 Sep 2020 13:03:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:37948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729065AbgIUQh3 (ORCPT ); Mon, 21 Sep 2020 12:37:29 -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 428D6206B7; Mon, 21 Sep 2020 16:37:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706248; bh=cFOb6X2TH9jpa/vZrkwFVssHoq37dH+POa/lNLMPUHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I5Fm4m7oVAfMUbGKtbr6tU+qAsZOizbv/1LglxYTxVTtPn5HX9pB4ZBYZDlEhdNq5 KHsPxKm1ozpCl2mJOOGnjMioIqv6/LAjnRk51COaacGgQANGQu402okr1JKgYhDVMW iwAlDUl8NrUEhOGMnX551l9R6BG4NwoExJG5CqNk= 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.14 07/94] ARM: dts: BCM5301X: Fixed QSPI compatible string Date: Mon, 21 Sep 2020 18:26:54 +0200 Message-Id: <20200921162035.884232548@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921162035.541285330@linuxfoundation.org> References: <20200921162035.541285330@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Florian Fainelli [ Upstream commit b793dab8d811e103665d6bddaaea1c25db3776eb ] The string was incorrectly defined before from least to most specific, swap the compatible strings accordingly. Fixes: 1c8f40650723 ("ARM: dts: BCM5301X: convert to iProc QSPI") Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- arch/arm/boot/dts/bcm5301x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 501877e87a5b8..dffa8b9bd536d 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -426,7 +426,7 @@ }; spi@18029200 { - compatible = "brcm,spi-bcm-qspi", "brcm,spi-nsp-qspi"; + compatible = "brcm,spi-nsp-qspi", "brcm,spi-bcm-qspi"; reg = <0x18029200 0x184>, <0x18029000 0x124>, <0x1811b408 0x004>,