mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-01 19:46:51 +00:00
2ad898e091
Removed upstreamed: generic/backport-6.1/789-STABLE-01-net-dsa-mt7530-prevent-possible-incorrect-XTAL-frequ.patch [1] generic/backport-6.1/789-STABLE-02-net-dsa-mt7530-fix-link-local-frames-that-ingress-vl.patch [2] generic/backport-6.1/789-STABLE-03-net-dsa-mt7530-fix-handling-of-all-link-local-frames.patch [3] generic/pending-6.1/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch [4] generic/pending-6.1/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch [5] Manual adjusted the following patches: mediatek/patches-6.1/100-dts-update-mt7622-rfb1.patch 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=be4512b9ac6fc53e1ca8daccbda84f643215c547 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=f1fa919ea59655f73cb3972264e157b8831ba546 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=86c0c154a759f2af9612a04bdf29110f02dce956 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=6b62bad2da1b338f452a9380639fc9b093d75a25 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=f78807362828ad01db2a9ed005bf79501b620f27 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
71 lines
1.8 KiB
Diff
71 lines
1.8 KiB
Diff
From d278f43f25beedfd0cb784d1dd0a9e7e8c8f123f Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Wed, 19 Apr 2023 20:15:53 +0100
|
|
Subject: [PATCH] arm64: dts: mt7622: declare SPI-NAND present on BPI-R64
|
|
|
|
The SPI-NOR node in the device tree of the BananaPi R64 has most likely
|
|
been copied from the reference board's device tree even though the R64
|
|
comes with an SPI-NAND chip rather than SPI-NOR.
|
|
|
|
Setup the Serial NAND Flash Interface (SNFI) controller, enable
|
|
hardware BCH error detection and correction engine and add the SPI-NAND
|
|
chip including basic partitions,
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Link: https://lore.kernel.org/r/ZEA96dmaXqTpk8u8@makrotopia.org
|
|
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
|
|
---
|
|
.../dts/mediatek/mt7622-bananapi-bpi-r64.dts | 38 ++++++++++++++++---
|
|
1 file changed, 33 insertions(+), 5 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
|
@@ -254,14 +254,42 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
-&nor_flash {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&spi_nor_pins>;
|
|
- status = "disabled";
|
|
+&bch {
|
|
+ status = "okay";
|
|
+};
|
|
|
|
+&snfi {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&serial_nand_pins>;
|
|
+ status = "okay";
|
|
flash@0 {
|
|
- compatible = "jedec,spi-nor";
|
|
+ compatible = "spi-nand";
|
|
reg = <0>;
|
|
+ spi-tx-bus-width = <4>;
|
|
+ spi-rx-bus-width = <4>;
|
|
+ nand-ecc-engine = <&snfi>;
|
|
+ partitions {
|
|
+ compatible = "fixed-partitions";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+
|
|
+ partition@0 {
|
|
+ label = "bl2";
|
|
+ reg = <0x0 0x80000>;
|
|
+ read-only;
|
|
+ };
|
|
+
|
|
+ partition@80000 {
|
|
+ label = "fip";
|
|
+ reg = <0x80000 0x200000>;
|
|
+ read-only;
|
|
+ };
|
|
+
|
|
+ ubi: partition@280000 {
|
|
+ label = "ubi";
|
|
+ reg = <0x280000 0x7d80000>;
|
|
+ };
|
|
+ };
|
|
};
|
|
};
|
|
|