From 572278d3a0390f1ad37eefab7fe86af5050d4199 Mon Sep 17 00:00:00 2001 From: Russell Senior Date: Tue, 10 Mar 2020 18:06:02 -0700 Subject: [PATCH] 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 --- target/linux/ath79/dts/ar7241_ubnt_airrouter.dts | 3 ++- target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts | 4 +++- target/linux/ath79/dts/ar7241_ubnt_nanostation-loco-m.dts | 4 +++- target/linux/ath79/dts/ar7241_ubnt_nanostation-m.dts | 4 +++- target/linux/ath79/dts/ar7241_ubnt_picostation-m.dts | 4 +++- target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts | 4 +++- .../ath79/dts/{ar7241_ubnt_xm.dtsi => ar724x_ubnt_xm.dtsi} | 5 ----- ...41_ubnt_xm_outdoor.dtsi => ar724x_ubnt_xm_outdoor.dtsi} | 2 -- target/linux/ath79/image/generic-ubnt.mk | 7 ++++++- 9 files changed, 23 insertions(+), 14 deletions(-) rename target/linux/ath79/dts/{ar7241_ubnt_xm.dtsi => ar724x_ubnt_xm.dtsi} (92%) rename target/linux/ath79/dts/{ar7241_ubnt_xm_outdoor.dtsi => ar724x_ubnt_xm_outdoor.dtsi} (94%) diff --git a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts index ad2762e20c..dd2421da8e 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts @@ -1,7 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar7241_ubnt_xm.dtsi" +#include "ar7241.dtsi" +#include "ar724x_ubnt_xm.dtsi" / { compatible = "ubnt,airrouter", "ubnt,xm", "qca,ar7241"; diff --git a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts index e16b5fa0be..a43ed2afdc 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts @@ -1,7 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /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"; diff --git a/target/linux/ath79/dts/ar7241_ubnt_nanostation-loco-m.dts b/target/linux/ath79/dts/ar7241_ubnt_nanostation-loco-m.dts index 386b7c7073..60d5a21a22 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_nanostation-loco-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_nanostation-loco-m.dts @@ -1,7 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /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"; diff --git a/target/linux/ath79/dts/ar7241_ubnt_nanostation-m.dts b/target/linux/ath79/dts/ar7241_ubnt_nanostation-m.dts index eebe65e53f..82344bb5ea 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_nanostation-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_nanostation-m.dts @@ -1,7 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /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"; diff --git a/target/linux/ath79/dts/ar7241_ubnt_picostation-m.dts b/target/linux/ath79/dts/ar7241_ubnt_picostation-m.dts index e2376a1b92..d05aca3e67 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_picostation-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_picostation-m.dts @@ -1,7 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /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"; diff --git a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts index 35f5205b41..9e342177e2 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts @@ -1,7 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /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"; diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi b/target/linux/ath79/dts/ar724x_ubnt_xm.dtsi similarity index 92% rename from target/linux/ath79/dts/ar7241_ubnt_xm.dtsi rename to target/linux/ath79/dts/ar724x_ubnt_xm.dtsi index e2b653b3a7..b36b0d4fe2 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi +++ b/target/linux/ath79/dts/ar724x_ubnt_xm.dtsi @@ -3,12 +3,7 @@ #include #include -#include "ar7241.dtsi" - / { - compatible = "ubnt,xm", "qca,ar7241"; - model = "Ubiquiti Networks XM (rev 1.0) board"; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi b/target/linux/ath79/dts/ar724x_ubnt_xm_outdoor.dtsi similarity index 94% rename from target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi rename to target/linux/ath79/dts/ar724x_ubnt_xm_outdoor.dtsi index 75116edc51..a28f8fbcd4 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi +++ b/target/linux/ath79/dts/ar724x_ubnt_xm_outdoor.dtsi @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "ar7241_ubnt_xm.dtsi" - / { aliases { led-boot = &led_link4; diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index a4aff09fec..aad177bf4a 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -71,7 +71,6 @@ endef define Device/ubnt-xm $(Device/ubnt) - SOC := ar7241 DEVICE_VARIANT := XM DEVICE_PACKAGES += kmod-usb-ohci IMAGE_SIZE := 7448k @@ -108,6 +107,7 @@ TARGET_DEVICES += ubnt_acb-isp define Device/ubnt_airrouter $(Device/ubnt-xm) + SOC := ar7241 DEVICE_MODEL := AirRouter SUPPORTED_DEVICES += airrouter endef @@ -115,6 +115,7 @@ TARGET_DEVICES += ubnt_airrouter define Device/ubnt_bullet-m $(Device/ubnt-xm) + SOC := ar7241 DEVICE_MODEL := Bullet-M DEVICE_PACKAGES += rssileds SUPPORTED_DEVICES += bullet-m @@ -181,6 +182,7 @@ TARGET_DEVICES += ubnt_nanostation-ac-loco define Device/ubnt_nanostation-loco-m $(Device/ubnt-xm) + SOC := ar7241 DEVICE_MODEL := Nanostation Loco M DEVICE_PACKAGES += rssileds SUPPORTED_DEVICES += bullet-m @@ -197,6 +199,7 @@ TARGET_DEVICES += ubnt_nanostation-loco-m-xw define Device/ubnt_nanostation-m $(Device/ubnt-xm) + SOC := ar7241 DEVICE_MODEL := Nanostation M DEVICE_PACKAGES += rssileds SUPPORTED_DEVICES += nanostation-m @@ -213,6 +216,7 @@ TARGET_DEVICES += ubnt_nanostation-m-xw define Device/ubnt_picostation-m $(Device/ubnt-xm) + SOC := ar7241 DEVICE_MODEL := Picostation M DEVICE_PACKAGES += rssileds SUPPORTED_DEVICES += bullet-m @@ -221,6 +225,7 @@ TARGET_DEVICES += ubnt_picostation-m define Device/ubnt_rocket-m $(Device/ubnt-xm) + SOC := ar7241 DEVICE_MODEL := Rocket-M DEVICE_PACKAGES += rssileds SUPPORTED_DEVICES += rocket-m -- 2.30.2