aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-12-19 11:07:29 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-12-19 11:07:29 +0000
commit3e807886d0edd224584a507683ed7cdaea937e5a (patch)
tree22e0dba54da37fdaf82afe9d5b31e72e5690de1f
parent32877b31dc8e6ae32e3c889edf6a9cbecb8d8b81 (diff)
downloadupstream-3e807886d0edd224584a507683ed7cdaea937e5a.tar.gz
upstream-3e807886d0edd224584a507683ed7cdaea937e5a.tar.bz2
upstream-3e807886d0edd224584a507683ed7cdaea937e5a.zip
ramips: disable NAND device in mt7621.dtsi to fix boot errors on many devices
Enable it from .dts files that need it, also remove redundant properties Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 47936
-rw-r--r--target/linux/ramips/dts/UBNT-ERX.dts7
-rw-r--r--target/linux/ramips/dts/WF-2881.dts7
-rw-r--r--target/linux/ramips/dts/mt7621.dtsi2
3 files changed, 4 insertions, 12 deletions
diff --git a/target/linux/ramips/dts/UBNT-ERX.dts b/target/linux/ramips/dts/UBNT-ERX.dts
index db8e3e7a6b..ec31a37f0b 100644
--- a/target/linux/ramips/dts/UBNT-ERX.dts
+++ b/target/linux/ramips/dts/UBNT-ERX.dts
@@ -42,12 +42,7 @@
};
nand@1e003000 {
- compatible = "mtk,mt7621-nand";
- bank-width = <2>;
- reg = <0x1e003000 0x800
- 0x1e003800 0x800>;
- #address-cells = <1>;
- #size-cells = <1>;
+ status = "okay";
partition@0 {
label = "u-boot";
diff --git a/target/linux/ramips/dts/WF-2881.dts b/target/linux/ramips/dts/WF-2881.dts
index 9cd1aead35..aaafe5af82 100644
--- a/target/linux/ramips/dts/WF-2881.dts
+++ b/target/linux/ramips/dts/WF-2881.dts
@@ -22,12 +22,7 @@
};
nand@1e003000 {
- compatible = "mtk,mt7621-nand";
- bank-width = <2>;
- reg = <0x1e003000 0x800
- 0x1e003800 0x800>;
- #address-cells = <1>;
- #size-cells = <1>;
+ status = "okay";
partition@0 {
label = "u-boot";
diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index 9501c7e4e7..3dd7bd08a1 100644
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -272,6 +272,8 @@
};
nand@1e003000 {
+ status = "disabled";
+
compatible = "mtk,mt7621-nand";
bank-width = <2>;
reg = <0x1e003000 0x800