[openwrt/openwrt] ath79: split dtsi for D-Link COVR-P2500
LEDE Commits
lede-commits at lists.infradead.org
Sat Mar 9 11:35:23 PST 2024
chunkeey pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/6fa2ae30bbfa0fb0919fcd0dd3b96b185594c7f1
commit 6fa2ae30bbfa0fb0919fcd0dd3b96b185594c7f1
Author: Sebastian Schaper <openwrt at sebastianschaper.net>
AuthorDate: Sun Feb 11 18:53:07 2024 +0100
ath79: split dtsi for D-Link COVR-P2500
in preparation of adding COVR-C1200
Signed-off-by: Sebastian Schaper <openwrt at sebastianschaper.net>
---
.../ath79/dts/qca9563_dlink_covr-p2500-a1.dts | 163 +--------------------
...k_covr-p2500-a1.dts => qca9563_dlink_covr.dtsi} | 51 +------
target/linux/ath79/image/generic.mk | 12 +-
3 files changed, 12 insertions(+), 214 deletions(-)
diff --git a/target/linux/ath79/dts/qca9563_dlink_covr-p2500-a1.dts b/target/linux/ath79/dts/qca9563_dlink_covr-p2500-a1.dts
index 3b0c2afb50..19bf874b64 100644
--- a/target/linux/ath79/dts/qca9563_dlink_covr-p2500-a1.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_covr-p2500-a1.dts
@@ -1,11 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "qca956x.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/mtd/partitions/uimage.h>
+#include "qca9563_dlink_covr.dtsi"
/ {
compatible = "dlink,covr-p2500-a1", "qca,qca9563";
@@ -18,22 +13,6 @@
led-upgrade = &led_power_red;
};
- keys {
- compatible = "gpio-keys";
-
- wps {
- label = "wps";
- linux,code = <KEY_WPS_BUTTON>;
- gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
- };
-
- reset {
- label = "reset";
- linux,code = <KEY_RESTART>;
- gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
- };
- };
-
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
@@ -70,144 +49,4 @@
linux,default-trigger = "phy1radio";
};
};
-
- virtual_flash {
- compatible = "mtd-concat";
-
- devices = <&fwconcat0 &fwconcat1>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- compatible = "openwrt,uimage", "denx,uimage";
- openwrt,ih-magic = <0x68737173>;
- label = "firmware";
- reg = <0x0 0x0>;
- };
- };
- };
-};
-
-&spi {
- status = "okay";
-
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <50000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "u-boot";
- reg = <0x0 0x40000>;
- read-only;
- };
-
- partition at 40000 {
- label = "u-boot-env";
- reg = <0x40000 0x10000>;
- read-only;
- };
-
- fwconcat0: partition at 50000 {
- label = "fwconcat0";
- reg = <0x50000 0xe30000>;
- };
-
- partition at e80000 {
- label = "loader";
- reg = <0xe80000 0x10000>;
- read-only;
- };
-
- fwconcat1: partition at e90000 {
- label = "fwconcat1";
- reg = <0xe90000 0x160000>;
- };
-
- art: partition at ff0000 {
- label = "art";
- reg = <0xff0000 0x10000>;
- read-only;
-
- nvmem-layout {
- compatible = "fixed-layout";
- #address-cells = <1>;
- #size-cells = <1>;
-
- calibration_ath9k: calibration at 1000 {
- reg = <0x1000 0x440>;
- };
-
- precalibration_ath10k: pre-calibration at 5000 {
- reg = <0x5000 0x2f20>;
- };
- };
- };
- };
- };
-};
-
-&pcie {
- status = "okay";
-
- wifi at 0,0 {
- compatible = "qcom,ath10k";
- reg = <0 0 0 0 0>;
-
- nvmem-cells = <&precalibration_ath10k>;
- nvmem-cell-names = "pre-calibration";
- };
-};
-
-&gpio {
- phy-reset {
- gpio-hog;
- gpios = <11 GPIO_ACTIVE_LOW>;
- output-low;
- line-name = "phy-reset";
- };
-};
-
-&mdio0 {
- status = "okay";
-
- phy0: ethernet-phy at 0 {
- reg = <0>;
- phy-mode = "sgmii";
- qca,mib-poll-interval = <500>;
-
- qca,ar8327-initvals = <
- 0x04 0x00080080 /* PORT0 PAD MODE CTRL */
- 0x10 0x81000080 /* POWER_ON_STRAP */
- 0x50 0xcc35cc35 /* LED_CTRL0 */
- 0x54 0xcb37cb37 /* LED_CTRL1 */
- 0x58 0x00000000 /* LED_CTRL2 */
- 0x5c 0x00f3cf00 /* LED_CTRL3 */
- 0x7c 0x0000007e /* PORT0_STATUS */
- >;
- };
-};
-
-ð0 {
- status = "okay";
-
- pll-data = <0x03000101 0x00000101 0x00001919>;
-
- phy-mode = "sgmii";
- phy-handle = <&phy0>;
-};
-
-&wmac {
- status = "okay";
-
- nvmem-cells = <&calibration_ath9k>;
- nvmem-cell-names = "calibration";
};
diff --git a/target/linux/ath79/dts/qca9563_dlink_covr-p2500-a1.dts b/target/linux/ath79/dts/qca9563_dlink_covr.dtsi
similarity index 73%
copy from target/linux/ath79/dts/qca9563_dlink_covr-p2500-a1.dts
copy to target/linux/ath79/dts/qca9563_dlink_covr.dtsi
index 3b0c2afb50..5138cbc796 100644
--- a/target/linux/ath79/dts/qca9563_dlink_covr-p2500-a1.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_covr.dtsi
@@ -8,16 +8,6 @@
#include <dt-bindings/mtd/partitions/uimage.h>
/ {
- compatible = "dlink,covr-p2500-a1", "qca,qca9563";
- model = "D-Link COVR-P2500 A1";
-
- aliases {
- led-boot = &led_power_green;
- led-failsafe = &led_power_red;
- led-running = &led_power_green;
- led-upgrade = &led_power_red;
- };
-
keys {
compatible = "gpio-keys";
@@ -34,43 +24,6 @@
};
};
- leds {
- compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&jtag_disable_pins>;
-
- lan {
- function = LED_FUNCTION_LAN;
- color = <LED_COLOR_ID_GREEN>;
- gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
- };
-
- led_power_green: power_green {
- function = LED_FUNCTION_POWER;
- color = <LED_COLOR_ID_GREEN>;
- gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
- default-state = "on";
- };
-
- wlan5g {
- label = "green:wlan5g";
- gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy0radio";
- };
-
- led_power_red: power_red {
- function = LED_FUNCTION_POWER;
- color = <LED_COLOR_ID_RED>;
- gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
- };
-
- wlan2g {
- label = "green:wlan2g";
- gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy1radio";
- };
- };
-
virtual_flash {
compatible = "mtd-concat";
@@ -137,6 +90,8 @@
reg = <0xff0000 0x10000>;
read-only;
+ compatible = "nvmem-cells";
+
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
@@ -158,7 +113,7 @@
&pcie {
status = "okay";
- wifi at 0,0 {
+ wifi0: wifi at 0,0 {
compatible = "qcom,ath10k";
reg = <0 0 0 0 0>;
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 3bdc043738..d5d8aa5592 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -1007,21 +1007,25 @@ define Device/devolo_magic-2-wifi
endef
TARGET_DEVICES += devolo_magic-2-wifi
-define Device/dlink_covr-p2500-a1
+define Device/dlink_covr
$(Device/loader-okli-uimage)
SOC := qca9563
DEVICE_VENDOR := D-Link
- DEVICE_MODEL := COVR-P2500
- DEVICE_VARIANT := A1
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
LOADER_FLASH_OFFS := 0x050000
LOADER_KERNEL_MAGIC := 0x68737173
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x68737173
IMAGE_SIZE := 14528k
- IMAGES += factory.bin recovery.bin
IMAGE/recovery.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \
append-rootfs | pad-rootfs | check-size | pad-to 14528k | \
append-loader-okli-uimage $(1) | pad-to 15616k
+endef
+
+define Device/dlink_covr-p2500-a1
+ $(Device/dlink_covr)
+ DEVICE_MODEL := COVR-P2500
+ DEVICE_VARIANT := A1
+ IMAGES += factory.bin recovery.bin
IMAGE/factory.bin := $$(IMAGE/recovery.bin) | \
dlink-sge-image COVR-P2500 | dlink-sge-signature COVR-P2500
endef
More information about the lede-commits
mailing list