mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 08:51:13 +00:00
8cc7ac54b6
Manually rebased: generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch generic/pending-5.4/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch Removed upstreamed: generic/backport-5.4/040-ARM-8918-2-only-build-return_address-if-needed.patch layerscape/patches-5.4/819-uart-0004-MLK-18137-fsl_lpuart-Fix-loopback-mode.patch All others updated automatically. Compile-tested on: lantiq/xrx200, armvirt/64 Runtime-tested on: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
53 lines
1.4 KiB
Diff
53 lines
1.4 KiB
Diff
From ae5dad214ec109cdeffd3fac5ce4be6ab59a0283 Mon Sep 17 00:00:00 2001
|
|
From: Kuldeep Singh <kuldeep.singh@nxp.com>
|
|
Date: Fri, 3 Jan 2020 14:49:07 +0530
|
|
Subject: [PATCH] LF-18-2 arm64: dts: ls1046ardb: Update qspi node dts
|
|
properties
|
|
|
|
Use compatibles as "jedec,spi-nor" to probe flash without displaying
|
|
warning: found s25fs512s, expected m25p80.
|
|
Remove "fsl,qspi-has-second-chip" as new driver doesn't use it anymore.
|
|
Update rx and tx width to 1.
|
|
|
|
Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
|
|
---
|
|
arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 17 ++++++++---------
|
|
1 file changed, 8 insertions(+), 9 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
|
|
@@ -100,25 +100,24 @@
|
|
|
|
&qspi {
|
|
status = "okay";
|
|
- fsl,qspi-has-second-chip;
|
|
|
|
- qflash0: flash@0 {
|
|
- compatible = "spansion,m25p80";
|
|
+ s25fs512s0: flash@0 {
|
|
+ compatible = "jedec,spi-nor";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
spi-max-frequency = <50000000>;
|
|
- spi-rx-bus-width = <4>;
|
|
- spi-tx-bus-width = <4>;
|
|
+ spi-rx-bus-width = <1>;
|
|
+ spi-tx-bus-width = <1>;
|
|
reg = <0>;
|
|
};
|
|
|
|
- qflash1: flash@1 {
|
|
- compatible = "spansion,m25p80";
|
|
+ s25fs512s: flash@1 {
|
|
+ compatible = "jedec,spi-nor";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
spi-max-frequency = <50000000>;
|
|
- spi-rx-bus-width = <4>;
|
|
- spi-tx-bus-width = <4>;
|
|
+ spi-rx-bus-width = <1>;
|
|
+ spi-tx-bus-width = <1>;
|
|
reg = <1>;
|
|
};
|
|
};
|