From 46112609d0bf7cb9659d0eb0462e02108c7880b7 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 2 Dec 2015 17:20:39 +0000
Subject: [PATCH] lantiq: fix up m25p80 device ids (#20975)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47690
---
 target/linux/lantiq/dts/DGN1000B.dts   | 3 +--
 target/linux/lantiq/dts/DGN3500.dtsi   | 3 +--
 target/linux/lantiq/dts/EASY80920.dtsi | 3 +--
 target/linux/lantiq/dts/FRITZ3370.dts  | 3 +--
 target/linux/lantiq/dts/TDW89X0.dtsi   | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/target/linux/lantiq/dts/DGN1000B.dts b/target/linux/lantiq/dts/DGN1000B.dts
index 3b522acf4b0..4ccab9349c1 100644
--- a/target/linux/lantiq/dts/DGN1000B.dts
+++ b/target/linux/lantiq/dts/DGN1000B.dts
@@ -44,9 +44,8 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "mx25l3205d";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
-				linux,modalias = "m25p80", "mx25l64";
 				spi-max-frequency = <5000000>;
 
 				partition@0 {
diff --git a/target/linux/lantiq/dts/DGN3500.dtsi b/target/linux/lantiq/dts/DGN3500.dtsi
index 5d2c4565319..bcb995e3a28 100644
--- a/target/linux/lantiq/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/dts/DGN3500.dtsi
@@ -82,9 +82,8 @@
 		m25p80@0 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			compatible = "s25fl129p0";
+			compatible = "jedec,spi-nor";
 			reg = <0 0>;
-			linux,modalias = "m25p80", "mx25l3205d";
 			spi-max-frequency = <1000000>;
 
 			partition@0 {
diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi
index 4013610667c..a9293af377c 100644
--- a/target/linux/lantiq/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/dts/EASY80920.dtsi
@@ -34,9 +34,8 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				compatible = "s25fl129p0";
+				compatible = "jedec,spi-nor";
 				reg = <0 0>;
-				linux,modalias = "m25p80", "mx25l3205d";
 				spi-max-frequency = <1000000>;
 
 				partition@0 {
diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index c0202bab0fb..91eb7b60b7f 100644
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -178,9 +178,8 @@
 		m25p80@0 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			compatible = "mx25l2005a";
+			compatible = "jedec,spi-nor";
 			reg = <0 0>;
-			linux,modalias = "m25p80", "mx25l2005a";
 			spi-max-frequency = <1000000>;
 
 			ath9k_cal: partition@0 {
diff --git a/target/linux/lantiq/dts/TDW89X0.dtsi b/target/linux/lantiq/dts/TDW89X0.dtsi
index 084aa25e233..8ee036c8c98 100644
--- a/target/linux/lantiq/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/dts/TDW89X0.dtsi
@@ -157,9 +157,8 @@
 		m25p80@0 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			compatible = "en25q64", "m25p80";
+			compatible = "jedec,spi-nor";
 			reg = <0 0>;
-			linux,modalias = "en25q64";
 			spi-max-frequency = <1000000>;
 
 			partition@0 {