From: Pavel Kubelun <be.dissent@gmail.com>
Date: Thu, 18 Jan 2018 10:21:49 +0000 (+0300)
Subject: ipq806x: reference ipq8065 as ipq8064 v3.0
X-Git-Tag: v18.06.0-rc1~120
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=715ff75b1b70098e81335f8744a57411492d509e;p=oweals%2Fopenwrt.git

ipq806x: reference ipq8065 as ipq8064 v3.0

ipq8065 is ipq8064 v3.0
> socinfo_init: v6, id=280, ver=3.0, raw_id=17, raw_ver=17, hw_plat=0,  hw_plat_ver=65536

Include dtsi accordingly and remove the unneeded qcom-ipq8065-v1.0.dtsi

Signed-off-by: Pavel Kubelun <be.dissent@gmail.com>
[slh: rebase for kernel v4.14 as well]
Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>

(cherry picked from commit e16f9abf6b5b5d56d83892d7d86d89023f1e5d42)
---

diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
index 2f829795bc..ae411607a0 100644
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
@@ -1,4 +1,4 @@
-#include "qcom-ipq8065-v1.0.dtsi"
+#include "qcom-ipq8065.dtsi"
 
 #include <dt-bindings/input/input.h>
 
diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index a590fadd0e..867091176f 100644
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -1,4 +1,4 @@
-#include "qcom-ipq8065-v1.0.dtsi"
+#include "qcom-ipq8065.dtsi"
 
 #include <dt-bindings/input/input.h>
 
diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-v1.0.dtsi b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-v1.0.dtsi
deleted file mode 100644
index 22b5338cc0..0000000000
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-v1.0.dtsi
+++ /dev/null
@@ -1 +0,0 @@
-#include "qcom-ipq8065.dtsi"
diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065.dtsi
index 15f3b95f85..211fb6ad2b 100644
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065.dtsi
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065.dtsi
@@ -1,4 +1,4 @@
-#include "qcom-ipq8064.dtsi"
+#include "qcom-ipq8064-v2.0.dtsi"
 
 / {
 	model = "Qualcomm IPQ8065";
diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
index 2f829795bc..ae411607a0 100644
--- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
+++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
@@ -1,4 +1,4 @@
-#include "qcom-ipq8065-v1.0.dtsi"
+#include "qcom-ipq8065.dtsi"
 
 #include <dt-bindings/input/input.h>
 
diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index a590fadd0e..867091176f 100644
--- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -1,4 +1,4 @@
-#include "qcom-ipq8065-v1.0.dtsi"
+#include "qcom-ipq8065.dtsi"
 
 #include <dt-bindings/input/input.h>
 
diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-v1.0.dtsi b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-v1.0.dtsi
deleted file mode 100644
index 22b5338cc0..0000000000
--- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-v1.0.dtsi
+++ /dev/null
@@ -1 +0,0 @@
-#include "qcom-ipq8065.dtsi"
diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065.dtsi
index 15f3b95f85..211fb6ad2b 100644
--- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065.dtsi
+++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065.dtsi
@@ -1,4 +1,4 @@
-#include "qcom-ipq8064.dtsi"
+#include "qcom-ipq8064-v2.0.dtsi"
 
 / {
 	model = "Qualcomm IPQ8065";