Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ath79: merge D-Link DAP-2695 with dtsi

Browse source 
Further devices from the series have been added in the meantime,
introducing `qca955x_dlink_dap-2xxx.dtsi`.

Thus, merge support for DAP-2695 with the existing dtsi.

This implies factory images can now be flashed via the regular
OEM Web UI, as well as the bootloader recovery.

Signed-off-by: Sebastian Schaper <openwrt@sebastianschaper.net>
This commit is contained in:
Sebastian Schaper 2020-11-30 18:20:18 +01:00 committed by Hauke Mehrtens
parent be88f416db
commit 25df327086
2 changed files with 23 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
View file

@ -1,9 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qca955x.dtsi" #include "qca955x_dlink_dap-2xxx.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
/ { / {
compatible = "dlink,dap-2695-a1", "qca,qca9558"; compatible = "dlink,dap-2695-a1", "qca,qca9558";
@ -48,69 +45,29 @@
}; };
}; };
&spi { &partitions {
status = "okay"; partition@70000 {
label = "firmware";
reg = <0x070000 0xf00000>;
compatible = "wrg";
};
flash@0 { partition@f70000 {
#address-cells = <1>; label = "captival";
#size-cells = <1>; reg = <0xf70000 0x070000>;
compatible = "mx25l12805d"; read-only;
reg = <0>; };
spi-max-frequency = <50000000>;
partitions { partition@fe0000 {
compatible = "fixed-partitions"; label = "certificate";
#address-cells = <1>; reg = <0xfe0000 0x010000>;
#size-cells = <1>; read-only;
};
partition@0 { art: partition@ff0000 {
label = "u-boot"; label = "art";
reg = <0x000000 0x040000>; reg = <0xff0000 0x010000>;
read-only; read-only;
};
partition@40000 {
label = "bdcfg";
reg = <0x040000 0x010000>;
read-only;
};
partition@50000 {
label = "rgdb";
reg = <0x050000 0x010000>;
read-only;
};
partition@60000 {
label = "langpack";
reg = <0x060000 0x010000>;
read-only;
};
partition@70000 {
compatible = "wrg";
label = "firmware";
reg = <0x070000 0xf00000>;
};
partition@f70000 {
label = "captival";
reg = <0xf70000 0x070000>;
read-only;
};
partition@fe0000 {
label = "certificate";
reg = <0xfe0000 0x010000>;
read-only;
};
art: partition@ff0000 {
label = "art";
reg = <0xff0000 0x010000>;
read-only;
};
};
}; };
}; };
@ -156,9 +113,3 @@
&pcie0 { &pcie0 {
status = "okay"; status = "okay";
}; };
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
};

11
target/linux/ath79/image/generic.mk
View file

@ -845,20 +845,13 @@ endef
TARGET_DEVICES += dlink_dap-2680-a1 TARGET_DEVICES += dlink_dap-2680-a1
define Device/dlink_dap-2695-a1 define Device/dlink_dap-2695-a1
$(Device/dlink_dap-2xxx)
SOC := qca9558 SOC := qca9558
DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct
DEVICE_VENDOR := D-Link DEVICE_VENDOR := D-Link
DEVICE_MODEL := DAP-2695 DEVICE_MODEL := DAP-2695
DEVICE_VARIANT := A1 DEVICE_VARIANT := A1
IMAGES := factory.img sysupgrade.bin DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct
IMAGE_SIZE := 15360k IMAGE_SIZE := 15360k
IMAGE/default := append-kernel | pad-offset 65536 160
IMAGE/factory.img := $$(IMAGE/default) | append-rootfs | wrgg-pad-rootfs | \
mkwrggimg | check-size
IMAGE/sysupgrade.bin := $$(IMAGE/default) | mkwrggimg | append-rootfs | \
wrgg-pad-rootfs | check-size | append-metadata
KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma
KERNEL_INITRAMFS := $$(KERNEL) | mkwrggimg
DAP_SIGNATURE := wapac02_dkbs_dap2695 DAP_SIGNATURE := wapac02_dkbs_dap2695
SUPPORTED_DEVICES += dap-2695-a1 SUPPORTED_DEVICES += dap-2695-a1
endef endef