diff mbox series

[4.19,14/78] ARM: dts: NSP: Fixed QSPI compatible string

Message ID	20200915140634.255645479@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=V2gr=CY=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Florian Fainelli <f.fainelli@gmail.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.19 14/78] ARM: dts: NSP: Fixed QSPI compatible string Date: Tue, 15 Sep 2020 16:12:39 +0200 Message-Id: <20200915140634.255645479@linuxfoundation.org> 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: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.19,02/78] ARM: dts: logicpd-som-lv-baseboard: Fix broken audio [4.19,03/78] ARM: dts: socfpga: fix register entry for timer3 on Arria10 [4.19,04/78] ARM: dts: ls1021a: fix QuadSPI-memory reg range [4.19,05/78] RDMA/rxe: Fix memleak in rxe_mem_init_user [4.19,06/78] RDMA/rxe: Drop pointless checks in rxe_init_ports [4.19,07/78] RDMA/bnxt_re: Do not report transparent vlan from QP1 [4.19,08/78] drm/sun4i: Fix dsi dcs long write function [4.19,09/78] iio: adc: mcp3422: fix locking on error path [4.19,10/78] scsi: libsas: Set data_dir as DMA_NONE if libata marks qc as NODATA [4.19,11/78] RDMA/core: Fix reported speed and width [4.19,12/78] mmc: sdhci-msm: Add retries when all tuning phases are found valid [4.19,13/78] ARM: dts: bcm: HR2: Fixed QSPI compatible string [4.19,14/78] ARM: dts: NSP: Fixed QSPI compatible string [4.19,15/78] ARM: dts: BCM5301X: Fixed QSPI compatible string [4.19,16/78] arm64: dts: ns2: Fixed QSPI compatible string [4.19,17/78] ARC: HSDK: wireup perf irq [4.19,18/78] dmaengine: acpi: Put the CSRT table after using it [4.19,19/78] netfilter: conntrack: allow sctp hearbeat after connection re-use [4.19,20/78] drivers/net/wan/lapbether: Added needed_tailroom [4.19,21/78] NFC: st95hf: Fix memleak in st95hf_in_send_cmd [4.19,22/78] firestream: Fix memleak in fs_open [4.19,23/78] ALSA: hda: Fix 2 channel swapping for Tegra [4.19,24/78] drivers/net/wan/lapbether: Set network_header before transmitting [4.19,25/78] xfs: initialize the shortform attr header padding entry [4.19,26/78] irqchip/eznps: Fix build error for !ARC700 builds [4.19,27/78] nvme-fabrics: dont check state NVME_CTRL_NEW for request acceptance [4.19,28/78] nvme: have nvme_wait_freeze_timeout return if it timed out [4.19,29/78] nvme-rdma: serialize controller teardown sequences [4.19,30/78] HID: quirks: Set INCREMENT_USAGE_ON_DUPLICATE for all Saitek X52 devices [4.19,31/78] drivers/net/wan/hdlc_cisco: Add hard_header_len [4.19,32/78] HID: elan: Fix memleak in elan_input_configured [4.19,33/78] ARC: [plat-hsdk]: Switch ethernet phy-mode to rgmii-id [4.19,34/78] cpufreq: intel_pstate: Refuse to turn off with HWP enabled [4.19,35/78] cpufreq: intel_pstate: Fix intel_pstate_get_hwp_max() for turbo disabled [4.19,36/78] ALSA: hda: fix a runtime pm issue in SOF when integrated GPU is disabled [4.19,37/78] drm/amdgpu: Fix bug in reporting voltage for CIK [4.19,38/78] iommu/amd: Do not use IOMMUv2 functionality when SME is active [4.19,39/78] gcov: Disable gcov build with GCC 10 [4.19,40/78] iio: adc: mcp3422: fix locking scope [4.19,41/78] iio: adc: ti-ads1015: fix conversion when CONFIG_PM is not set [4.19,42/78] iio:light:ltr501 Fix timestamp alignment issue. [4.19,43/78] iio:accel:bmc150-accel: Fix timestamp alignment and prevent data leak. [4.19,44/78] iio:adc:ti-adc084s021 Fix alignment and data leak issues. [4.19,45/78] iio:adc:ina2xx Fix timestamp alignment issue. [4.19,46/78] iio:adc:max1118 Fix alignment of timestamp and data leak issues [4.19,47/78] iio:adc:ti-adc081c Fix alignment and data leak issues [4.19,48/78] iio:magnetometer:ak8975 Fix alignment and data leak issues. [4.19,49/78] iio:light:max44000 Fix timestamp alignment and prevent data leak. [4.19,50/78] iio:chemical:ccs811: Fix timestamp alignment and prevent data leak. [4.19,51/78] iio: accel: kxsd9: Fix alignment of local buffer. [4.19,52/78] iio:accel:mma7455: Fix timestamp alignment and prevent data leak. [4.19,53/78] iio:accel:mma8452: Fix timestamp alignment and prevent data leak. [4.19,54/78] staging: wlan-ng: fix out of bounds read in prism2sta_probe_usb() [4.19,55/78] btrfs: require only sector size alignment for parent eb bytenr [4.19,56/78] btrfs: fix lockdep splat in add_missing_dev [4.19,57/78] btrfs: fix wrong address when faulting in pages in the search ioctl [4.19,58/78] regulator: push allocation in set_consumer_device_supply() out of lock [4.19,59/78] scsi: target: iscsi: Fix data digest calculation [4.19,60/78] scsi: target: iscsi: Fix hang in iscsit_access_np() when getting tpg->np_login_sem [4.19,61/78] drm/tve200: Stabilize enable/disable [4.19,62/78] drm/msm: Disable preemption on all 5xx targets [4.19,63/78] rbd: require global CAP_SYS_ADMIN for mapping and unmapping [4.19,64/78] RDMA/rxe: Fix the parent sysfs read when the interface has 15 chars [4.19,65/78] vgacon: remove software scrollback support [4.19,66/78] fbcon: remove soft scrollback code [4.19,67/78] fbcon: remove now unusued softback_lines cursor() argument [4.19,68/78] KVM: VMX: Dont freeze guest when event delivery causes an APIC-access exit [4.19,69/78] ARM: dts: vfxxx: Add syscon compatible with OCOTP [4.19,70/78] video: fbdev: fix OOB read in vga_8planes_imageblit() [4.19,71/78] staging: greybus: audio: fix uninitialized value issue [4.19,72/78] phy: qcom-qmp: Use correct values for ipq8074 PCIe Gen2 PHY init [4.19,73/78] usb: core: fix slab-out-of-bounds Read in read_descriptors [4.19,74/78] USB: serial: ftdi_sio: add IDs for Xsens Mti USB converter [4.19,75/78] USB: serial: option: support dynamic Quectel USB compositions [4.19,76/78] USB: serial: option: add support for SIM7070/SIM7080/SIM7090 modules [4.19,77/78] usb: Fix out of sync data toggle if a configured device is reconfigured [4.19,78/78] usb: typec: ucsi: acpi: Check the _DEP dependencies

Commit Message

Greg KH Sept. 15, 2020, 2:12 p.m. UTC

From: Florian Fainelli <f.fainelli@gmail.com>

[ 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 <f.fainelli@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 arch/arm/boot/dts/bcm-nsp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index 273a316045798..b395cb195db21 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -274,7 +274,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>,