mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
67978e4ce5
This includes:
1. BCM5301X changes from 5.14 and queued 5.15 stuff
2. NSP changes from 5.11 - 5.15 for kernel 5.10
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit bce00f47e5)
78 lines
2.0 KiB
Diff
78 lines
2.0 KiB
Diff
From b660269cba748dfd07eb5551a88ff34d5ea0b86e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Fri, 16 Apr 2021 15:37:48 +0200
|
|
Subject: [PATCH] ARM: dts: BCM5301X: Fix NAND nodes names
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This matches nand-controller.yaml requirements.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
|
|
--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
|
|
+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
|
|
@@ -24,8 +24,8 @@
|
|
reg = <0x00000000 0x08000000>;
|
|
};
|
|
|
|
- nand: nand@18028000 {
|
|
- nandcs@0 {
|
|
+ nand_controller: nand-controller@18028000 {
|
|
+ nand@0 {
|
|
partitions {
|
|
compatible = "fixed-partitions";
|
|
#address-cells = <1>;
|
|
--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
|
|
+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
|
|
@@ -25,8 +25,8 @@
|
|
<0x88000000 0x08000000>;
|
|
};
|
|
|
|
- nand: nand@18028000 {
|
|
- nandcs@0 {
|
|
+ nand_controller: nand-controller@18028000 {
|
|
+ nand@0 {
|
|
partitions {
|
|
compatible = "fixed-partitions";
|
|
#address-cells = <1>;
|
|
--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
|
|
@@ -6,8 +6,8 @@
|
|
*/
|
|
|
|
/ {
|
|
- nand@18028000 {
|
|
- nandcs: nandcs@0 {
|
|
+ nand-controller@18028000 {
|
|
+ nandcs: nand@0 {
|
|
compatible = "brcm,nandcs";
|
|
reg = <0>;
|
|
#address-cells = <1>;
|
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
|
@@ -502,7 +502,7 @@
|
|
reg = <0x18004000 0x14>;
|
|
};
|
|
|
|
- nand: nand@18028000 {
|
|
+ nand_controller: nand-controller@18028000 {
|
|
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
|
|
reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>;
|
|
reg-names = "nand", "iproc-idm", "iproc-ext";
|
|
--- a/arch/arm/boot/dts/bcm953012k.dts
|
|
+++ b/arch/arm/boot/dts/bcm953012k.dts
|
|
@@ -49,8 +49,8 @@
|
|
};
|
|
};
|
|
|
|
-&nand {
|
|
- nandcs@0 {
|
|
+&nand_controller {
|
|
+ nand@0 {
|
|
compatible = "brcm,nandcs";
|
|
reg = <0>;
|
|
nand-on-flash-bbt;
|