diff --git a/patches/0055-ath79-add-Support-for-Indio-305AC.patch b/patches/0055-ath79-add-Support-for-Indio-305AC.patch deleted file mode 100644 index fc3acaa71..000000000 --- a/patches/0055-ath79-add-Support-for-Indio-305AC.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 33752cc0bbadf34aac485c6e4c314bb6528f4d91 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Sat, 15 Jul 2023 12:05:30 +0200 -Subject: [PATCH 55/68] ath79: add Support for Indio 305AC - -Signed-off-by: Rohan Nathi ---- - .../ath79/dts/qca9531_indio_um-305ac.dts | 121 ++++++++++++++++++ - .../etc/hotplug.d/firmware/11-ath10k-caldata | 1 + - target/linux/ath79/image/generic.mk | 11 ++ - 3 files changed, 133 insertions(+) - create mode 100755 target/linux/ath79/dts/qca9531_indio_um-305ac.dts - -diff --git a/target/linux/ath79/dts/qca9531_indio_um-305ac.dts b/target/linux/ath79/dts/qca9531_indio_um-305ac.dts -new file mode 100755 -index 0000000000..63633b7ecb ---- /dev/null -+++ b/target/linux/ath79/dts/qca9531_indio_um-305ac.dts -@@ -0,0 +1,121 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -+ -+#include "qca953x.dtsi" -+ -+#include -+#include -+ -+/ { -+ model = "Indio UM-305AC"; -+ compatible = "indio,um-305ac", "qca,qca9531"; -+ -+ aliases { -+ led-boot = &led_status; -+ led-failsafe = &led_status; -+ led-running = &led_status; -+ led-upgrade = &led_status; -+ }; -+ -+ keys { -+ compatible = "gpio-keys"; -+ -+ reset { -+ label = "reset"; -+ linux,code = ; -+ gpios = <&gpio 17 GPIO_ACTIVE_LOW>; -+ debounce-interval = <60>; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ lan { -+ label = "green:lan"; -+ gpios = <&gpio 16 GPIO_ACTIVE_LOW>; -+ }; -+ -+ led_status: status { -+ label = "green:status"; -+ gpios = <&gpio 12 GPIO_ACTIVE_LOW>; -+ default-state = "keep"; -+ }; -+ -+ wan { -+ label = "green:wan"; -+ gpios = <&gpio 4 GPIO_ACTIVE_LOW>; -+ }; -+ -+ wlan2g { -+ label = "red:wlan2g"; -+ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "phy1tpt"; -+ }; -+ }; -+}; -+ -+&spi { -+ status = "okay"; -+ -+ flash@0 { -+ compatible = "jedec,spi-nor"; -+ reg = <0>; -+ spi-max-frequency = <25000000>; -+ -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ partition@0 { -+ label = "u-boot"; -+ reg = <0x000000 0x040000>; -+ read-only; -+ }; -+ -+ partition@40000 { -+ label = "u-boot-env"; -+ reg = <0x040000 0x010000>; -+ }; -+ -+ partition@50000 { -+ compatible = "denx,uimage"; -+ label = "firmware"; -+ reg = <0x050000 0xf90000>; -+ }; -+ -+ partition@fe0000 { -+ label = "certificates"; -+ reg = <0xfe0000 0x010000>; -+ }; -+ -+ art: partition@ff0000 { -+ label = "art"; -+ reg = <0xff0000 0x010000>; -+ read-only; -+ }; -+ }; -+ }; -+}; -+ -+ð0 { -+ status = "okay"; -+ -+ phy-handle = <&swphy4>; -+ -+ mtd-mac-address = <&art 0x0>; -+}; -+ -+ð1 { -+ mtd-mac-address = <&art 0x6>; -+}; -+ -+&pcie0 { -+ status = "okay"; -+}; -+ -+&wmac { -+ status = "okay"; -+ -+ mtd-cal-data = <&art 0x1000>; -+}; -diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -index f0a3755de9..d822f0bab8 100644 ---- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata -@@ -25,6 +25,7 @@ case "$FIRMWARE" in - comfast,cf-wr650ac-v2|\ - devolo,dlan-pro-1200plus-ac|\ - devolo,magic-2-wifi|\ -+ indio,um-305ac|\ - joyit,jt-or750i|\ - qxwlan,e1700ac-v2-8m|\ - qxwlan,e1700ac-v2-16m|\ -diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk -index 1a558c30a0..5882feafcb 100644 ---- a/target/linux/ath79/image/generic.mk -+++ b/target/linux/ath79/image/generic.mk -@@ -2991,6 +2991,17 @@ define Device/yuncore_a770 - endef - TARGET_DEVICES += yuncore_a770 - -+define Device/indio_um-305ac -+ SOC := qca9531 -+ DEVICE_VENDOR := Indio Network -+ DEVICE_MODEL := UM-305AC -+ DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9887 -+ IMAGE_SIZE := 16000k -+ IMAGES += tftp.bin -+ IMAGE/tftp.bin := $$(IMAGE/sysupgrade.bin) | yuncore-tftp-header-16m -+endef -+TARGET_DEVICES += indio_um-305ac -+ - define Device/yuncore_a782 - SOC := qca9563 - DEVICE_VENDOR := YunCore --- -2.34.1 - diff --git a/patches/0056-ath79-enable-bridge-vlan.patch b/patches/0056-ath79-enable-bridge-vlan.patch deleted file mode 100644 index 9088f7306..000000000 --- a/patches/0056-ath79-enable-bridge-vlan.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b7d537f23e2e30282cc4003256471ca590e505f3 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Sat, 15 Jul 2023 12:08:40 +0200 -Subject: [PATCH 56/68] ath79: enable bridge vlan - -Signed-off-by: John Crispin ---- - target/linux/ath79/generic/base-files/etc/board.d/02_network | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network -index 0d7396a04d..f819d3c8b8 100644 ---- a/target/linux/ath79/generic/base-files/etc/board.d/02_network -+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network -@@ -822,6 +822,7 @@ ath79_setup_macs() - - board_config_update - board=$(board_name) -+ucidef_set_bridge_device bridge - ath79_setup_interfaces $board - ath79_setup_macs $board - board_config_flush --- -2.34.1 -