diff --git a/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq60xx b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq60xx index d85fcf0e85..a4c6a02683 100644 --- a/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq60xx +++ b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq60xx @@ -35,14 +35,14 @@ xiaomi,ax1800|\ zn,m2|\ glinet,gl-ax1800|\ glinet,gl-axt1800|\ -linksys,mr7350|\ -linksys,mr7500) - ubootenv_add_mtd "u_env" "0x0" "0x40000" "0x20000" - ;; netgear,wax214|\ tplink,eap610-outdoor) ubootenv_add_mtd "0:appsblenv" "0x0" "0x40000" "0x20000" ;; +linksys,mr7350|\ +linksys,mr7500) + ubootenv_add_mtd "u_env" "0x0" "0x40000" "0x20000" + ;; yuncore,fap650) ubootenv_add_mtd "0:appsblenv" "0x0" "0x10000" "0x10000" ;; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mr7500.dts similarity index 97% rename from target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts rename to target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mr7500.dts index 9cfd3a5239..b1ae234f6e 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-mr7500.dts @@ -1,11 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -// Copyright 2024 Weikai Kong (priv at pppig236.com) /dts-v1/; -#include "ipq6018-512m.dtsi" -#include "ipq6018-cp-cpu.dtsi" +#include "ipq6018.dtsi" +#include "ipq6018-common.dtsi" #include "ipq6018-ess.dtsi" +#include "ipq6018-nss.dtsi" +#include "ipq6018-cp-cpu.dtsi" + #include #include #include @@ -13,7 +15,7 @@ / { model = "Linksys MR7500"; compatible = "linksys,mr7500", "qcom,ipq6018"; - + aliases { serial0 = &blsp1_uart3; serial1 = &blsp1_uart2; @@ -25,24 +27,24 @@ label-mac-device = &dp5_syn; }; - + chosen { stdout-path = "serial0:115200n8"; bootargs-append = " root=/dev/ubiblock0_0"; }; - + extcon_usb { pinctrl-0 = <&extcon_usb_pins>; pinctrl-names = "default"; id-gpio = <&tlmm 26 GPIO_ACTIVE_LOW>; status = "okay"; }; - + gpio_keys { compatible = "gpio-keys"; pinctrl-0 = <&button_pins>; pinctrl-names = "default"; - + wps { label = "wps"; linux,code = ; @@ -55,10 +57,10 @@ gpios = <&tlmm 56 GPIO_ACTIVE_LOW>; }; }; - + leds { compatible = "pwm-leds"; - + usb { color = ; function = LED_FUNCTION_USB; @@ -68,7 +70,7 @@ trigger-sources = <&usb3_port1>, <&usb3_port2>; linux,default-trigger = "usbport"; }; - + led_system_red: red { color = ; function = LED_FUNCTION_INDICATOR; @@ -76,14 +78,14 @@ max-brightness = <255>; panic-indicator; }; - + led_system_green: green { color = ; function = LED_FUNCTION_INDICATOR; pwms = <&pwm 3 1250000>; max-brightness = <255>; }; - + led_system_blue: blue { color = ; function = LED_FUNCTION_POWER; @@ -91,7 +93,7 @@ max-brightness = <255>; }; }; - + reg_usb_vbus: regulator-usb-vbus { compatible = "regulator-fixed"; regulator-name = "usb_vbus"; @@ -110,7 +112,7 @@ drive-strength = <8>; bias-pull-up; }; - + /*LED_USB*/ mux_1 { pins = "gpio30"; @@ -118,7 +120,7 @@ drive-strength = <8>; bias-pull-down; }; - + /*LED_R*/ mux_2 { pins = "gpio31"; @@ -126,7 +128,7 @@ drive-strength = <8>; bias-pull-down; }; - + /*LED_G*/ mux_3 { pins = "gpio32"; @@ -135,14 +137,14 @@ bias-pull-down; }; }; - + extcon_usb_pins: extcon_usb_pins { pins = "gpio26"; function = "gpio"; drive-strength = <2>; bias-pull-down; }; - + button_pins: button_pins { wps_button { pins = "gpio37"; @@ -214,7 +216,7 @@ pinctrl-names = "default"; reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>; status = "okay"; - + ethernet-phy-package { #address-cells = <1>; #size-cells = <0>; @@ -222,7 +224,7 @@ reg = <0>; qcom,package-mode = "qsgmii"; - + qca8075_0: ethernet-phy@0 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <0>; @@ -230,14 +232,14 @@ leds { #address-cells = <1>; #size-cells = <0>; - + led@0 { reg = <0>; color = ; function = LED_FUNCTION_LAN; default-state = "keep"; }; - + led@1 { reg = <1>; color = ; @@ -254,14 +256,14 @@ leds { #address-cells = <1>; #size-cells = <0>; - + led@0 { reg = <0>; color = ; function = LED_FUNCTION_LAN; default-state = "keep"; }; - + led@1 { reg = <1>; color = ; @@ -278,14 +280,14 @@ leds { #address-cells = <1>; #size-cells = <0>; - + led@0 { reg = <0>; color = ; function = LED_FUNCTION_LAN; default-state = "keep"; }; - + led@1 { reg = <1>; color = ; @@ -302,14 +304,14 @@ leds { #address-cells = <1>; #size-cells = <0>; - + led@0 { reg = <0>; color = ; function = LED_FUNCTION_LAN; default-state = "keep"; }; - + led@1 { reg = <1>; color = ; @@ -329,14 +331,14 @@ leds { #address-cells = <1>; #size-cells = <0>; - + led@0 { reg = <0>; color = ; function = LED_FUNCTION_WAN; default-state = "keep"; }; - + led@1 { reg = <1>; color = ; @@ -402,7 +404,7 @@ switch_wan_bmp = ; switch_mac_mode = ; switch_mac_mode1 = ; - + qcom,port_phyinfo { port@1 { port_id = <1>; @@ -447,10 +449,6 @@ }; }; -&qpic_bam { - status = "okay"; -}; - &qpic_nand { status = "okay"; @@ -486,19 +484,15 @@ }; }; -&ssphy_0 { - status = "okay"; -}; - &dwc_0 { #address-cells = <1>; #size-cells = <0>; - + usb3_port1: port@1 { reg = <1>; #trigger-source-cells = <0>; }; - + usb3_port2: port@2 { reg = <2>; #trigger-source-cells = <0>; @@ -515,10 +509,6 @@ vbus-supply = <®_usb_vbus>; }; -&pcie_phy { - status = "okay"; -}; - &pcie0 { status = "okay"; bridge@0,0 { @@ -526,7 +516,7 @@ #address-cells = <3>; #size-cells = <2>; ranges; - + wifi@1,0 { status = "okay"; /* ath11k has no DT compatible for PCI cards */ @@ -539,6 +529,6 @@ &wifi { status = "okay"; - qcom,ath11k-calibration-variant = "Linksys-MR7500"; qcom,ath11k-fw-memory-mode = <1>; + qcom,ath11k-calibration-variant = "Linksys-MR7500"; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-ess.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-ess.dtsi index c5c7e963ee..7ece28e040 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-ess.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-ess.dtsi @@ -160,7 +160,7 @@ "uniphy0_port_4_rst"; mdio-bus = <&mdio>; - switch_cpu_bmp = ; + switch_cpu_bmp = ; switch_inner_bmp = <(ESS_PORT6 | ESS_PORT7)>; switch_mac_mode = ; switch_mac_mode1 = ; diff --git a/target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac index 41ce6f413d..18799c1538 100755 --- a/target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac +++ b/target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac @@ -28,7 +28,8 @@ case "$board" in [ "$PHYNBR" = "0" ] && macaddr_add $label_mac 1 > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "1" ] && macaddr_add $label_mac 2 > /sys${DEVPATH}/macaddress ;; - linksys,mr7350) + linksys,mr7350|\ + linksys,mr7500) label_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr) [ "$PHYNBR" = "0" ] && macaddr_add $label_mac 2 > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "1" ] && macaddr_add $label_mac 3 > /sys${DEVPATH}/macaddress