ath79: rename qca9533.dtsi to qca953x.dtsi

qca9533 is a costdown version of qca9531 which doesn't have USB and PCIE.
Rename the misleading dtsi names and fix the SoC type of gl-ar300m.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
[apply the changes for the gl-x750 as well]
Signed-off-by: Mathias Kresin <dev@kresin.me>

8 files changed, 11 insertions, 11 deletions

diff --git a/target/linux/ath79/dts/qca9533_glinet_ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_ar300m.dtsi
index 35de594bf2..986177df01 100644
--- a/target/linux/ath79/dts/qca9533_glinet_ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_ar300m.dtsi
@@ -3,10 +3,10 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca9533.dtsi"
+#include "qca953x.dtsi"
 
 / {
-	compatible = "glinet,ar300m", "qca,qca9533";
+	compatible = "glinet,ar300m", "qca,qca9531";
 	model = "GL.iNet GL-AR300M";
 
 	keys {
diff --git a/target/linux/ath79/dts/qca9533_glinet_ar300m_nand.dts b/target/linux/ath79/dts/qca9531_glinet_ar300m_nand.dts
index 33226b9889..f188ac6c33 100644
--- a/target/linux/ath79/dts/qca9533_glinet_ar300m_nand.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_ar300m_nand.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "qca9533_glinet_ar300m.dtsi"
+#include "qca9531_glinet_ar300m.dtsi"
 
 &spi {
 	status = "okay";
diff --git a/target/linux/ath79/dts/qca9533_glinet_ar300m_nor.dts b/target/linux/ath79/dts/qca9531_glinet_ar300m_nor.dts
index 9357ea66d4..c78f03ac22 100644
--- a/target/linux/ath79/dts/qca9533_glinet_ar300m_nor.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_ar300m_nor.dts
@@ -3,7 +3,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca9533_glinet_ar300m.dtsi"
+#include "qca9531_glinet_ar300m.dtsi"
 
 &spi {
 	status = "okay";
diff --git a/target/linux/ath79/dts/qca9533_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
index 14bad8aab6..de12163f0d 100644
--- a/target/linux/ath79/dts/qca9533_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
@@ -4,10 +4,10 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca9533.dtsi"
+#include "qca953x.dtsi"
 
 / {
-	compatible = "glinet,gl-x750", "qca,qca9533";
+	compatible = "glinet,gl-x750", "qca,qca9531";
 	model = "GL.iNet GL-X750";
 
 	keys {
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
index 3621b7e1e8..5b8e8dbc68 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
@@ -4,7 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "qca9533.dtsi"
+#include "qca953x.dtsi"
 
 / {
 	chosen {
diff --git a/target/linux/ath79/dts/qca9533.dtsi b/target/linux/ath79/dts/qca953x.dtsi
index 97179a391e..4ce5bfe0a2 100644
--- a/target/linux/ath79/dts/qca9533.dtsi
+++ b/target/linux/ath79/dts/qca953x.dtsi
@@ -3,7 +3,7 @@
 #include "ath79.dtsi"
 
 / {
-	compatible = "qca,qca9533";
+	compatible = "qca,qca9530";
 
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 2b4556bc76..f0c7691102 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -175,7 +175,7 @@ endef
 TARGET_DEVICES += glinet_ar150
 
 define Device/glinet_ar300m_nor
-  ATH_SOC := qca9533
+  ATH_SOC := qca9531
   DEVICE_TITLE := GL.iNet GL-AR300M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2
   IMAGE_SIZE := 16000k
@@ -184,7 +184,7 @@ endef
 TARGET_DEVICES += glinet_ar300m_nor
 
 define Device/glinet_gl-x750
-  ATH_SOC := qca9533
+  ATH_SOC := qca9531
   DEVICE_TITLE := GL.iNet GL-X750
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2  kmod-ath10k ath10k-firmware-qca9887
   IMAGE_SIZE := 16000k
diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk
index 979afd2b2b..1852ca4179 100644
--- a/target/linux/ath79/image/nand.mk
+++ b/target/linux/ath79/image/nand.mk
@@ -1,5 +1,5 @@
 define Device/glinet_ar300m_nand
-  ATH_SOC := qca9533
+  ATH_SOC := qca9531
   DEVICE_TITLE := GL-AR300M (NAND)
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-usb-ledtrig-usbport
   KERNEL_SIZE := 2048k