domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ath79: rename qca9533.dtsi to qca953x.dtsi

Browse Source 
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>
This commit is contained in:
Chuanhong Guo
2018-10-29 11:56:46 +08:00
committed by Mathias Kresin
parent 5563d49a39
commit c36ec336a3
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ath79/dts/qca9533_glinet_ar300m.dtsi → target/linux/ath79/dts/qca9531_glinet_ar300m.dtsi
View File

@@ -3,10 +3,10 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.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"; model = "GL.iNet GL-AR300M";
keys { keys {

2
target/linux/ath79/dts/qca9533_glinet_ar300m_nand.dts → target/linux/ath79/dts/qca9531_glinet_ar300m_nand.dts
View File

@@ -1,6 +1,6 @@
/dts-v1/; /dts-v1/;
#include "qca9533_glinet_ar300m.dtsi" #include "qca9531_glinet_ar300m.dtsi"
&spi { &spi {
status = "okay"; status = "okay";

2
target/linux/ath79/dts/qca9533_glinet_ar300m_nor.dts → target/linux/ath79/dts/qca9531_glinet_ar300m_nor.dts
View File

@@ -3,7 +3,7 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include "qca9533_glinet_ar300m.dtsi" #include "qca9531_glinet_ar300m.dtsi"
&spi { &spi {
status = "okay"; status = "okay";

4
target/linux/ath79/dts/qca9533_glinet_gl-x750.dts → target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
View File

@@ -4,10 +4,10 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.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"; model = "GL.iNet GL-X750";
keys { keys {

2
target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
View File

@@ -4,7 +4,7 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include "qca9533.dtsi" #include "qca953x.dtsi"
/ { / {
chosen { chosen {

2
target/linux/ath79/dts/qca9533.dtsi → target/linux/ath79/dts/qca953x.dtsi
View File

@@ -3,7 +3,7 @@
#include "ath79.dtsi" #include "ath79.dtsi"
/ { / {
compatible = "qca,qca9533"; compatible = "qca,qca9530";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

4
target/linux/ath79/image/generic.mk
View File

@@ -175,7 +175,7 @@ endef
TARGET_DEVICES += glinet_ar150 TARGET_DEVICES += glinet_ar150
define Device/glinet_ar300m_nor define Device/glinet_ar300m_nor
ATH_SOC := qca9533 ATH_SOC := qca9531
DEVICE_TITLE := GL.iNet GL-AR300M DEVICE_TITLE := GL.iNet GL-AR300M
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2
IMAGE_SIZE := 16000k IMAGE_SIZE := 16000k
@@ -184,7 +184,7 @@ endef
TARGET_DEVICES += glinet_ar300m_nor TARGET_DEVICES += glinet_ar300m_nor
define Device/glinet_gl-x750 define Device/glinet_gl-x750
ATH_SOC := qca9533 ATH_SOC := qca9531
DEVICE_TITLE := GL.iNet GL-X750 DEVICE_TITLE := GL.iNet GL-X750
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca9887 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca9887
IMAGE_SIZE := 16000k IMAGE_SIZE := 16000k

2
target/linux/ath79/image/nand.mk
View File

@@ -1,5 +1,5 @@
define Device/glinet_ar300m_nand define Device/glinet_ar300m_nand
ATH_SOC := qca9533 ATH_SOC := qca9531
DEVICE_TITLE := GL-AR300M (NAND) DEVICE_TITLE := GL-AR300M (NAND)
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-usb-ledtrig-usbport DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-usb-ledtrig-usbport
KERNEL_SIZE := 2048k KERNEL_SIZE := 2048k