From mboxrd@z Thu Jan 1 00:00:00 1970 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 4EAEDC433E2 for ; Tue, 15 Sep 2020 23:39:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13B0120715 for ; Tue, 15 Sep 2020 23:39:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600213190; bh=oq0yfkhZ5+QWjIzLaDbYzHopAYNvik52ZcjWmDWRAlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lM2dP4u4vWamNU4T5XfZ0LWHEBygZTcENDKeiOyIL+xiowbwW67lILomLmdpADMoy 5c5u9PYI76j91fW7dIUyBq1WvY8wDIMB9iMKjYHUVFTZmzwJRXMcse2mQ748CUR8jN YepKy5zQmB69b4kH5ZKZT8wVITloEdlDF6umZZlo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727337AbgIOXjn (ORCPT ); Tue, 15 Sep 2020 19:39:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:47670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727079AbgIOOe6 (ORCPT ); Tue, 15 Sep 2020 10:34:58 -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 8368221D7E; Tue, 15 Sep 2020 14:15:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600179323; bh=oq0yfkhZ5+QWjIzLaDbYzHopAYNvik52ZcjWmDWRAlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OHjzDkCjf/ud2a2nXlKNNKe5cd4tkq5A9hSfPJbvJiXRaZpNPtRNibIIdaReNXmph d6njYFoxlTQ9YaVe6oo091uoPK1X5eFReiJF4Sezy89UHcz1dbFd3Nb6KZ06a/w1ke u+LmZSTUajwWIrb1d5tiMh9Rh5ZfpUbTGZiIAlT8= 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 15/78] ARM: dts: BCM5301X: Fixed QSPI compatible string Date: Tue, 15 Sep 2020 16:12:40 +0200 Message-Id: <20200915140634.312588802@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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 a678fb7c9e3b2..c91716d5980c3 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -445,7 +445,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>, -- 2.25.1