Skip to content

Commit

Permalink
Merge pull request #135 from openwrtdiy/openwrt-23.05
Browse files Browse the repository at this point in the history
Synchronize official source code
  • Loading branch information
openwrtdiy authored Oct 10, 2024
2 parents 72db21c + 1efcdb2 commit 501306c
Show file tree
Hide file tree
Showing 11 changed files with 340 additions and 14 deletions.
1 change: 1 addition & 0 deletions package/boot/uboot-envtools/files/ramips
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ jcg,q20|\
linksys,e7350|\
netgear,eax12|\
netgear,wax202|\
netis,n6|\
zyxel,wsm20)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000"
;;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,17 @@
pagesize = <32>;
reg = <0x50>;
read-only; /* This holds our MAC & Meraki board-data */
#address-cells = <1>;
#size-cells = <1>;

mac_address: mac-address@66 {
reg = <0x66 0x6>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;

mac_address: mac-address@66 {
compatible = "mac-base";
reg = <0x66 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
};
Expand Down Expand Up @@ -284,9 +290,8 @@
compatible = "qcom,ath10k";
status = "okay";
reg = <0x00010000 0 0 0 0>;
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};
};
};
Expand Down Expand Up @@ -390,22 +395,20 @@
&wifi0 {
status = "okay";
qcom,ath10k-calibration-variant = "Meraki-MR33";
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 2>;
nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
};

&wifi1 {
status = "okay";
qcom,ath10k-calibration-variant = "Meraki-MR33";
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 3>;
nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
};

&gmac {
status = "okay";
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 0>;
nvmem-cell-names = "mac-address";
};

Expand Down
5 changes: 4 additions & 1 deletion target/linux/ramips/dts/mt7620a_tplink_re2x0-v1.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/mtd/partitions/uimage.h>

/ {
aliases {
Expand Down Expand Up @@ -51,9 +52,11 @@
};

partition@20000 {
compatible = "tplink,firmware";
compatible = "openwrt,uimage", "denx,uimage";
label = "firmware";
reg = <0x20000 0x7c0000>;
openwrt,offset = <0x1000>;
openwrt,ih-magic = <IH_MAGIC_OKLI>;
};

partition@7e0000 {
Expand Down
229 changes: 229 additions & 0 deletions target/linux/ramips/dts/mt7621_netis_n6.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

#include "mt7621.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>

/ {
compatible = "netis,n6", "mediatek,mt7621-soc";
model = "netis N6";

aliases {
label-mac-device = &gmac0;

led-boot = &led_power_green;
led-failsafe = &led_system_green;
led-running = &led_power_green;
led-upgrade = &led_system_green;
};

chosen {
bootargs = "console=ttyS0,115200";
};

keys {
compatible = "gpio-keys";

key-0 {
label = "wps";
gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
debounce-interval = <60>;
};

key-1 {
label = "reset";
gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
debounce-interval = <60>;
};
};

leds {
compatible = "gpio-leds";

led-0 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_USB;
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
trigger-sources = <&xhci_ehci_port1>;
linux,default-trigger = "usbport";
};

led-1 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WPS;
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
};

led_system_green: led-2 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_INDICATOR;
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
};

led-3 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_WAN;
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};

led_power_green: led-4 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_POWER;
gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
};
};
};

&gmac0 {
nvmem-cells = <&macaddr_factory_7ef20 0>;
nvmem-cell-names = "mac-address";
};

&gmac1 {
status = "okay";
label = "wan";
phy-handle = <&ethphy4>;

nvmem-cells = <&macaddr_factory_7ef26 0>;
nvmem-cell-names = "mac-address";
};

&mdio {
ethphy4: ethernet-phy@4 {
reg = <4>;
};
};

&nand {
status = "okay";

mediatek,nmbm;
mediatek,bmt-remap-range = <0x000000 0x580000>;

partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

partition@0 {
label = "u-boot";
reg = <0x0 0x80000>;
read-only;
};

partition@80000 {
label = "Config";
reg = <0x80000 0x80000>;
};

partition@100000 {
label = "Factory";
reg = <0x100000 0x80000>;
read-only;

nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;

eeprom_factory_0: eeprom@0 {
reg = <0x0 0xe00>;
};

macaddr_factory_7ef20: macaddr@7ef20 {
reg = <0x7ef20 0x6>;
};

macaddr_factory_7ef26: macaddr@7ef26 {
reg = <0x7ef26 0x6>;
};
};
};

partition@180000 {
label = "firmware";
reg = <0x180000 0x7680000>;

compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

partition@0 {
label = "kernel";
reg = <0x0 0x400000>;
};

partition@400000 {
label = "ubi";
reg = <0x400000 0x7280000>;
};
};
};
};

&pcie {
status = "okay";
};

&pcie1 {
wifi@0,0 {
compatible = "mediatek,mt76";
reg = <0x0000 0 0 0 0>;

/*
* *** The code block below is commented out ***
* Reason: Probably, original Netis N6 EEPROM has wrong
* MT_EE_WIFI_CONF value 0xd2. As a result 2.4 GHz
* doesn't start with mt76 driver. Other routers
* with the same WLAN chips (e.g., Routerich
* AX1800) have MT_EE_WIFI_CONF = 0x92.
* Workaround: Extract EEPROM to a file at the first time
* boot and change MT_EE_WIFI_CONF (offset
* 0x190) value from 0xd2 to 0x92. See
* /etc/hotplug.d/firmware/11-mt76-caldata for
* details.
*/

/*
nvmem-cells = <&eeprom_factory_0>;
nvmem-cell-names = "eeprom";
*/

mediatek,disable-radar-background;
};
};

&state_default {
gpio {
groups = "i2c", "jtag", "wdt";
function = "gpio";
};
};

&switch0 {
ports {
port@0 {
status = "okay";
label = "lan4";
};

port@1 {
status = "okay";
label = "lan3";
};

port@2 {
status = "okay";
label = "lan2";
};

port@3 {
status = "okay";
label = "lan1";
};
};
};
25 changes: 25 additions & 0 deletions target/linux/ramips/image/common-tp-link.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD
DEVICE_VARS += TPLINK_HVERSION TPLINK_BOARD_ID TPLINK_HEADER_VERSION

define Build/tplink-v1-okli-image
cp $(IMAGE_KERNEL) $(IMAGE_ROOTFS).$(word 2,$(1))
cat $(IMAGE_ROOTFS) >> $(IMAGE_ROOTFS).$(word 2,$(1))
-$(STAGING_DIR_HOST)/bin/mktplinkfw \
-H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \
-N "$(VERSION_DIST)" -V $(REVISION) -m $(TPLINK_HEADER_VERSION) \
-k "$(KDIR)/loader-$(word 1,$(1)).$(LOADER_TYPE)" -E $(KERNEL_LOADADDR) \
-r $(IMAGE_ROOTFS).$(word 2,$(1)) -o $@.new -j -X 0x40000 \
-a $(call rootfs_align,$(FILESYSTEM)) $(wordlist 3,$(words $(1)),$(1)) \
$(if $(findstring sysupgrade,$(word 2,$(1))),-s) && mv $@.new $@ || rm -f $@
rm -f $(IMAGE_ROOTFS).$(word 2,$(1))
endef

define Build/uImage-tplink-c9
mkimage \
-A $(LINUX_KARCH) \
Expand Down Expand Up @@ -28,6 +41,18 @@ define Device/tplink-v1
append-metadata
endef

define Device/tplink-v1-okli
$(Device/tplink-v1)
LOADER_TYPE := bin
LOADER_FLASH_OFFS := 0x21000
COMPILE := loader-$(1).bin
COMPILE/loader-$(1).bin := loader-okli-compile | pad-to 64k | lzma | pad-to 3584
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49
IMAGE/factory.bin := tplink-v1-okli-image $(1) factory -e -O
IMAGE/sysupgrade.bin := tplink-v1-okli-image $(1) sysupgrade -e -O | check-size | \
append-metadata
endef

define Device/tplink-v2
DEVICE_VENDOR := TP-Link
TPLINK_FLASHLAYOUT :=
Expand Down
4 changes: 2 additions & 2 deletions target/linux/ramips/image/mt7620.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1245,7 +1245,7 @@ endef
TARGET_DEVICES += tplink_archer-mr200

define Device/tplink_re200-v1
$(Device/tplink-v1)
$(Device/tplink-v1-okli)
SOC := mt7620a
DEVICE_MODEL := RE200
DEVICE_VARIANT := v1
Expand All @@ -1257,7 +1257,7 @@ endef
TARGET_DEVICES += tplink_re200-v1

define Device/tplink_re210-v1
$(Device/tplink-v1)
$(Device/tplink-v1-okli)
SOC := mt7620a
DEVICE_MODEL := RE210
DEVICE_VARIANT := v1
Expand Down
Loading

0 comments on commit 501306c

Please sign in to comment.