hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ath79: generalize ubnt_xm dtsi for ar7240 and ar7241 

* Prepare to support the AR7240 variant of ubiquiti bullet m, by
  reorganizing the related dtsi files.

* Distribute SOC variable across ubnt-xm devices.

Signed-off-by: Russell Senior <russell@personaltelco.net>
master
Russell Senior 2020-03-10 18:06:02 -07:00 committed by Adrian Schmutzler
parent dabe8471fc
commit 572278d3a0
9 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
View File

@ -1,7 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/; /dts-v1/;
#include "ar7241_ubnt_xm.dtsi" #include "ar7241.dtsi"
#include "ar724x_ubnt_xm.dtsi"
/ { / {
compatible = "ubnt,airrouter", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,airrouter", "ubnt,xm", "qca,ar7241";

4
target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
View File

@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/; /dts-v1/;
#include "ar7241_ubnt_xm_outdoor.dtsi" #include "ar7241.dtsi"
#include "ar724x_ubnt_xm.dtsi"
#include "ar724x_ubnt_xm_outdoor.dtsi"
/ { / {
compatible = "ubnt,bullet-m", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,bullet-m", "ubnt,xm", "qca,ar7241";

4
target/linux/ath79/dts/ar7241_ubnt_nanostation-loco-m.dts
View File

@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/; /dts-v1/;
#include "ar7241_ubnt_xm_outdoor.dtsi" #include "ar7241.dtsi"
#include "ar724x_ubnt_xm.dtsi"
#include "ar724x_ubnt_xm_outdoor.dtsi"
/ { / {
compatible = "ubnt,nanostation-loco-m", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,nanostation-loco-m", "ubnt,xm", "qca,ar7241";

4
target/linux/ath79/dts/ar7241_ubnt_nanostation-m.dts
View File

@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/; /dts-v1/;
#include "ar7241_ubnt_xm_outdoor.dtsi" #include "ar7241.dtsi"
#include "ar724x_ubnt_xm.dtsi"
#include "ar724x_ubnt_xm_outdoor.dtsi"
/ { / {
compatible = "ubnt,nanostation-m", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,nanostation-m", "ubnt,xm", "qca,ar7241";

4
target/linux/ath79/dts/ar7241_ubnt_picostation-m.dts
View File

@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/; /dts-v1/;
#include "ar7241_ubnt_xm_outdoor.dtsi" #include "ar7241.dtsi"
#include "ar724x_ubnt_xm.dtsi"
#include "ar724x_ubnt_xm_outdoor.dtsi"
/ { / {
compatible = "ubnt,picostation-m", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,picostation-m", "ubnt,xm", "qca,ar7241";

4
target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
View File

@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/; /dts-v1/;
#include "ar7241_ubnt_xm_outdoor.dtsi" #include "ar7241.dtsi"
#include "ar724x_ubnt_xm.dtsi"
#include "ar724x_ubnt_xm_outdoor.dtsi"
/ { / {
compatible = "ubnt,rocket-m", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,rocket-m", "ubnt,xm", "qca,ar7241";

5
target/linux/ath79/dts/ar7241_ubnt_xm.dtsi → target/linux/ath79/dts/ar724x_ubnt_xm.dtsi
View File

@ -3,12 +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 "ar7241.dtsi"
/ { / {
compatible = "ubnt,xm", "qca,ar7241";
model = "Ubiquiti Networks XM (rev 1.0) board";
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";

2
target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi → target/linux/ath79/dts/ar724x_ubnt_xm_outdoor.dtsi
View File

@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "ar7241_ubnt_xm.dtsi"
/ { / {
aliases { aliases {
led-boot = &led_link4; led-boot = &led_link4;

7
target/linux/ath79/image/generic-ubnt.mk
View File

@ -71,7 +71,6 @@ endef
define Device/ubnt-xm define Device/ubnt-xm
$(Device/ubnt) $(Device/ubnt)
SOC := ar7241
DEVICE_VARIANT := XM DEVICE_VARIANT := XM
DEVICE_PACKAGES += kmod-usb-ohci DEVICE_PACKAGES += kmod-usb-ohci
IMAGE_SIZE := 7448k IMAGE_SIZE := 7448k
@ -108,6 +107,7 @@ TARGET_DEVICES += ubnt_acb-isp
define Device/ubnt_airrouter define Device/ubnt_airrouter
$(Device/ubnt-xm) $(Device/ubnt-xm)
SOC := ar7241
DEVICE_MODEL := AirRouter DEVICE_MODEL := AirRouter
SUPPORTED_DEVICES += airrouter SUPPORTED_DEVICES += airrouter
endef endef
@ -115,6 +115,7 @@ TARGET_DEVICES += ubnt_airrouter
define Device/ubnt_bullet-m define Device/ubnt_bullet-m
$(Device/ubnt-xm) $(Device/ubnt-xm)
SOC := ar7241
DEVICE_MODEL := Bullet-M DEVICE_MODEL := Bullet-M
DEVICE_PACKAGES += rssileds DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += bullet-m SUPPORTED_DEVICES += bullet-m
@ -181,6 +182,7 @@ TARGET_DEVICES += ubnt_nanostation-ac-loco
define Device/ubnt_nanostation-loco-m define Device/ubnt_nanostation-loco-m
$(Device/ubnt-xm) $(Device/ubnt-xm)
SOC := ar7241
DEVICE_MODEL := Nanostation Loco M DEVICE_MODEL := Nanostation Loco M
DEVICE_PACKAGES += rssileds DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += bullet-m SUPPORTED_DEVICES += bullet-m
@ -197,6 +199,7 @@ TARGET_DEVICES += ubnt_nanostation-loco-m-xw
define Device/ubnt_nanostation-m define Device/ubnt_nanostation-m
$(Device/ubnt-xm) $(Device/ubnt-xm)
SOC := ar7241
DEVICE_MODEL := Nanostation M DEVICE_MODEL := Nanostation M
DEVICE_PACKAGES += rssileds DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += nanostation-m SUPPORTED_DEVICES += nanostation-m
@ -213,6 +216,7 @@ TARGET_DEVICES += ubnt_nanostation-m-xw
define Device/ubnt_picostation-m define Device/ubnt_picostation-m
$(Device/ubnt-xm) $(Device/ubnt-xm)
SOC := ar7241
DEVICE_MODEL := Picostation M DEVICE_MODEL := Picostation M
DEVICE_PACKAGES += rssileds DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += bullet-m SUPPORTED_DEVICES += bullet-m
@ -221,6 +225,7 @@ TARGET_DEVICES += ubnt_picostation-m
define Device/ubnt_rocket-m define Device/ubnt_rocket-m
$(Device/ubnt-xm) $(Device/ubnt-xm)
SOC := ar7241
DEVICE_MODEL := Rocket-M DEVICE_MODEL := Rocket-M
DEVICE_PACKAGES += rssileds DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += rocket-m SUPPORTED_DEVICES += rocket-m