From: Christian Lamparter <chunkeey@gmail.com>
Date: Sat, 22 Dec 2018 19:25:45 +0000 (+0100)
Subject: ipq40xx: remove qcom,ipq4019 on all devices
X-Git-Tag: v19.07.0-rc1~1752
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a2501ebfb06688b2519cd06583c0468522257f3b;p=oweals%2Fopenwrt.git

ipq40xx: remove qcom,ipq4019 on all devices

Upstream commit:
80483c3abf8 ("ARM: qcom: Cleanup/Remove unnecessary board file")
removed all the platform device compatibles stating that:
"This patch removes the unnecessary board file. The generic machine
definition is sufficient for the Qualcomm platforms."

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---

diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts
index 6bc178ccfa..bfebad0e65 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts
@@ -22,7 +22,7 @@
 
 / {
 	model = "OpenMesh A42";
-	compatible = "openmesh,a42", "qcom,ipq4019";
+	compatible = "openmesh,a42";
 
 	soc {
 		rng@22000 {
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
index 7a40103873..f7ef4cd026 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
@@ -7,7 +7,7 @@
 
 / {
 	model = "EnGenius EAP1300";
-	compatible = "engenius,eap1300", "qcom,ipq4019";
+	compatible = "engenius,eap1300";
 
 	soc {
 		rng@22000 {
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6100v2.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6100v2.dts
index a0abe41517..2b93dcbb99 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6100v2.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6100v2.dts
@@ -21,7 +21,7 @@
 
 / {
 	model = "Netgear EX6100v2";
-	compatible = "netgear,ex6100v2", "qcom,ipq4019";
+	compatible = "netgear,ex6100v2";
 };
 
 &wifi0 {
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6150v2.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6150v2.dts
index e0b5c38b33..f1c44c1ae8 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6150v2.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex6150v2.dts
@@ -21,7 +21,7 @@
 
 / {
 	model = "Netgear EX6150v2";
-	compatible = "netgear,ex6150v2", "qcom,ipq4019";
+	compatible = "netgear,ex6150v2";
 };
 
 &wifi0 {
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
index bb6cf4ee02..348f252961 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
@@ -22,7 +22,7 @@
 
 / {
 	model = "Netgear EX61X0v2";
-	compatible = "netgear,ex61x0v2", "qcom,ipq4019";
+	compatible = "netgear,ex61x0v2";
 
 	soc {
 		rng@22000 {
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts
index 976e7498ed..f9508cc460 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts
@@ -7,7 +7,7 @@
 
 / {
 	model = "AVM FRITZ!Box 4040";
-	compatible = "avm,fritzbox-4040", "qcom,ipq4019";
+	compatible = "avm,fritzbox-4040";
 
 	aliases {
 		led-boot = &power;
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts
index 003b4764a8..9730f1027f 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts
@@ -22,7 +22,7 @@
 
 / {
 	model = "8devices Jalapeno";
-	compatible = "8dev,jalapeno", "qcom,ipq4019";
+	compatible = "8dev,jalapeno";
 
 	soc {
 		rng@22000 {
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts
index 4083100beb..2ee8f075d7 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts
@@ -8,7 +8,7 @@
 
 / {
 	model = "ZyXEL NBG6617";
-	compatible = "zyxel,nbg6617", "qcom,ipq4019";
+	compatible = "zyxel,nbg6617";
 
 	chosen {
 		/*
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
index 62d4218ea6..c09962dc08 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
@@ -22,7 +22,7 @@
 
 / {
 	model = "ZyXEL WRE6606";
-	compatible = "zyxel,wre6606", "qcom,ipq4019";
+	compatible = "zyxel,wre6606";
 
 	aliases {
 		led-boot = &power;
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts
index 71c822feb2..72c4f0e915 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts
@@ -22,7 +22,7 @@
 
 / {
 	model = "OpenMesh A62";
-	compatible = "openmesh,a62", "qcom,ipq4019";
+	compatible = "openmesh,a62";
 
 	soc {
 		rng@22000 {
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
index 778fad3e3b..188c28e8c7 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
@@ -23,7 +23,7 @@
 
 / {
 	model = "Compex WPJ428";
-	compatible = "compex,wpj428", "qcom,ipq4019";
+	compatible = "compex,wpj428";
 
 	soc {
 		rng@22000 {
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
index 816f033d43..b4937de07c 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
@@ -21,7 +21,7 @@
 
 / {
 	model = "GL.iNet GL-B1300";
-	compatible = "glinet,gl-b1300", "qcom,ipq4019";
+	compatible = "glinet,gl-b1300";
 
 	aliases {
 		led-boot = &power;
diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-mr33.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-mr33.dts
index 8dcde3bdb9..5894097373 100644
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-mr33.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-mr33.dts
@@ -19,7 +19,7 @@
 
 / {
 	model = "Meraki MR33 Access Point";
-	compatible = "meraki,mr33", "qcom,ipq4019";
+	compatible = "meraki,mr33";
 
 	aliases {
 		led-boot = &status_green;
diff --git a/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch b/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch
index 349f67c665..48825375eb 100644
--- a/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch
+++ b/target/linux/ipq40xx/patches-4.19/900-dts-ipq4019-ap-dk01.1.patch
@@ -85,7 +85,7 @@
  
  / {
  	model = "Qualcomm Technologies, Inc. IPQ40xx/AP-DK01.1-C1";
-+	compatible = "qcom,ap-dk01.1-c1", "qcom,ap-dk01.2-c1", "qcom,ipq4019";
++	compatible = "qcom,ap-dk01.1-c1", "qcom,ap-dk01.2-c1";
  
 +	memory {
 +		device_type = "memory";