From: Mathias Kresin <dev@kresin.me>
Date: Sat, 7 Oct 2017 09:03:43 +0000 (+0200)
Subject: lantiq: remove gen_nand compatible string
X-Git-Tag: v18.06.0-rc1~2087
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a6bd7255ab393ec3a992f2f706cd8177292ef0fc;p=oweals%2Fopenwrt.git

lantiq: remove gen_nand compatible string

The generic nand driver fails to load with:

  gen_nand 14000000.nand-parts: platform_nand_data is missing
  gen_nand: probe of 14000000.nand-parts failed with error -22

and the xway-nand driver is used afterwards.

Drop the gen_nand compatible to get rid of the error message.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---

diff --git a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
index 87b4dfbd4a..d81a113c84 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
@@ -74,7 +74,7 @@
 			};
 
 			nand-parts@0 {		  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
-				compatible = "gen_nand", "lantiq,nand-xway";
+				compatible = "lantiq,nand-xway";
 				lantiq,cs = <1>;
 				bank-width = <2>;
 				reg = <1 0x0 0x2000000 >;
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
index ca9020bf73..aa37acd540 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
@@ -34,7 +34,7 @@
 	fpi@10000000 {
 		localbus@0 {
 			nand-parts@0 {		  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
-				compatible = "gen_nand", "lantiq,nand-xway";
+				compatible = "lantiq,nand-xway";
 				lantiq,cs = <1>;
 				bank-width = <2>;
 				reg = <1 0x0 0x2000000 >;
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
index a33690cef6..81c0511d8c 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
@@ -27,7 +27,7 @@
 	fpi@10000000 {
 		localbus@0 {
 			nand-parts@0 {
-				compatible = "gen_nand", "lantiq,nand-xway";
+				compatible = "lantiq,nand-xway";
 				lantiq,cs = <1>;
 				bank-width = <2>;
 				reg = <0x1 0x0 0x2000000>;
diff --git a/target/linux/lantiq/dts/EASY80920NAND.dts b/target/linux/lantiq/dts/EASY80920NAND.dts
index 332f2fb35c..cc5fc2227a 100644
--- a/target/linux/lantiq/dts/EASY80920NAND.dts
+++ b/target/linux/lantiq/dts/EASY80920NAND.dts
@@ -14,7 +14,7 @@
 		localbus@0 {
 			ranges = <0 0 0x4000000 0x3ffffff>;
 			nand-parts@0 {
-				compatible = "gen_nand", "lantiq,nand-xway";
+				compatible = "lantiq,nand-xway";
 				lantiq,cs = <1>;
 				bank-width = <2>;
 				reg = <0 0x0 0x2000000>;
diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index 3f57f45ee8..b4b98e75cf 100644
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -28,7 +28,7 @@
 	fpi@10000000 {
 		localbus@0 {
 			nand-parts@0 {
-				compatible = "gen_nand", "lantiq,nand-xway";
+				compatible = "lantiq,nand-xway";
 				bank-width = <2>;
 				reg = <1 0x0 0x2000000>;
 				#address-cells = <1>;
diff --git a/target/linux/lantiq/dts/P2812HNUF1.dts b/target/linux/lantiq/dts/P2812HNUF1.dts
index b1d9eedb35..176aae26b5 100644
--- a/target/linux/lantiq/dts/P2812HNUF1.dts
+++ b/target/linux/lantiq/dts/P2812HNUF1.dts
@@ -13,7 +13,7 @@
 	fpi@10000000 {
 		localbus@0 {
 			nand-parts@0 {
-				compatible = "gen_nand", "lantiq,nand-xway";
+				compatible = "lantiq,nand-xway";
 				lantiq,cs = <1>;
 				bank-width = <2>;
 				reg = <0 0x0 0x2000000>;
diff --git a/target/linux/lantiq/dts/P2812HNUF3.dts b/target/linux/lantiq/dts/P2812HNUF3.dts
index 366d034670..93d2071da5 100644
--- a/target/linux/lantiq/dts/P2812HNUF3.dts
+++ b/target/linux/lantiq/dts/P2812HNUF3.dts
@@ -36,7 +36,7 @@
 			};
 
 			nand-parts@0 {
-				compatible = "gen_nand", "lantiq,nand-xway";
+				compatible = "lantiq,nand-xway";
 				lantiq,cs = <1>;
 				bank-width = <2>;
 				reg = <1 0x0 0x2000000>;