From: Rafał Miłecki <rafal@milecki.pl>
Date: Sun, 17 Jun 2018 20:39:20 +0000 (+0200)
Subject: bcm53xx: fix NAND partitions on D-Link DIR-885L
X-Git-Tag: v18.06.0-rc2~48
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;ds=sidebyside;h=6eaffbd6eec6e94811dbd2ab54da29f8adf67ff0;p=openwrt%2Fopenwrt.git

bcm53xx: fix NAND partitions on D-Link DIR-885L

This fixes missing rootfs on above device:
[    2.652292] VFS: Cannot open root device "(null)" or unknown-block(0,0): error -6
(...)
[    2.687909] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0)

Fixes: 05cb6aa69f66 ("bcm53xx: replace linux,part-probe with a proper partitions subnode")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit e53d0da775082ee5d1d18949b00850590cf81650)
---

diff --git a/target/linux/bcm53xx/patches-4.14/037-v4.18-0007-ARM-dts-BCM5301X-Switch-D-Link-DIR-885L-to-the-new-p.patch b/target/linux/bcm53xx/patches-4.14/037-v4.18-0007-ARM-dts-BCM5301X-Switch-D-Link-DIR-885L-to-the-new-p.patch
new file mode 100644
index 0000000000..e397ddd0b2
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.14/037-v4.18-0007-ARM-dts-BCM5301X-Switch-D-Link-DIR-885L-to-the-new-p.patch
@@ -0,0 +1,39 @@
+From a05f1e36a57d02374a203719abc5bf2e8c51e125 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 10 May 2018 23:20:00 +0200
+Subject: [PATCH] ARM: dts: BCM5301X: Switch D-Link DIR-885L to the new
+ partitions syntax
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This new syntax is slightly better designed & uses "compatible" string.
+For details see Documentation/devicetree/bindings/mtd/partition.txt .
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+@@ -26,9 +26,15 @@
+ 
+ 	nand: nand@18028000 {
+ 		nandcs@0 {
+-			partition@0 {
+-				label = "firmware";
+-				reg = <0x00000000 0x08000000>;
++			partitions {
++				compatible = "fixed-partitions";
++				#address-cells = <1>;
++				#size-cells = <1>;
++
++				partition@0 {
++					label = "firmware";
++					reg = <0x00000000 0x08000000>;
++				};
+ 			};
+ 		};
+ 	};