diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ap8220.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ap8220.dts index f7a71a4a2..f49e37700 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ap8220.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ap8220.dts @@ -15,11 +15,10 @@ aliases { serial0 = &blsp1_uart5; - serial1 = &blsp1_uart3; - led-boot = &led_pwr; - led-failsafe = &led_pwr; - led-running = &led_pwr; - led-upgrade = &led_pwr; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; chosen { @@ -35,144 +34,65 @@ reset { label = "reset"; linux,code = ; - gpios = <&tlmm 0x42 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 66 GPIO_ACTIVE_LOW>; }; }; leds { compatible = "gpio-leds"; - pinctrl-0 = <&led_pins>; - pinctrl-names = "default"; - led_pwr: power { - label = "pwr"; - gpio = <&tlmm 0x2e GPIO_ACTIVE_HIGH>; + led_power: power { + label = "green:power"; + gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>; }; - led_2g: 2g { - label = "wlan2g"; - gpio = <&tlmm 0x2f GPIO_ACTIVE_HIGH>; + wlan2g { + label = "green:wlan2g"; + gpios = <&tlmm 47 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy1radio"; }; - led_5g: 5g { - label = "wlan5g"; - gpio = <&tlmm 0x30 GPIO_ACTIVE_HIGH>; + wlan5g { + label = "green:wlan5g"; + gpios = <&tlmm 48 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy0radio"; }; - led_ble: ble { - label = "ble"; - gpio = <&tlmm 0x32 GPIO_ACTIVE_HIGH>; + bluetooth { + label = "green:bluetooth"; + gpios = <&tlmm 50 GPIO_ACTIVE_HIGH>; }; }; }; &tlmm { - button_pins: button_pins { - phandle = <0x52>; - - wps_button { - pins = "gpio66"; - function = "gpio"; - drive-strength = <0x08>; - bias-pull-up; - }; - }; - - usb_mux_pins { - - mux { - pins = "gpio27"; - function = "gpio"; - drive-strength = <0x08>; - bias-pull-down; - }; - }; - - pcie_pins { - - pcie0_rst { - pins = "gpio58"; - function = "pcie0_rst"; - drive-strength = <0x08>; - bias-pull-down; - }; - - pcie0_wake { - pins = "gpio59"; - function = "pcie0_wake"; - drive-strength = <0x08>; - bias-pull-down; - }; - }; - mdio_pins: mdio-pins { - phandle = <0x27>; - - mux_0 { + mdc { pins = "gpio68"; function = "mdc"; - drive-strength = <0x08>; + drive-strength = <8>; bias-pull-up; }; - mux_1 { + mdio { pins = "gpio69"; function = "mdio"; - drive-strength = <0x08>; - bias-pull-up; - }; - - mux_2 { - pins = "gpio33"; - function = "gpio"; - bias-pull-up; - }; - - mux_3 { - pins = "gpio44"; - function = "gpio"; + drive-strength = <8>; bias-pull-up; }; }; - led_pins: led-pins { - phandle = <0x53>; - - led_pwr { - pins = "gpio46"; + button_pins: button-pins { + mux { + pins = "gpio66"; function = "gpio"; - drive-strength = <0x02>; + drive-strength = <8>; bias-pull-up; }; - - led_2g { - pins = "gpio47"; - function = "gpio"; - drive-strength = <0x02>; - bias-pull-down; - }; - - led_5g { - pins = "gpio48"; - function = "gpio"; - drive-strength = <0x02>; - bias-pull-down; - }; - - led_ble { - pins = "gpio50"; - function = "gpio"; - drive-strength = <0x02>; - bias-pull-down; - }; }; - }; &blsp1_spi1 { - pinctrl-0 = <&spi_0_pins>; - pinctrl-names = "default"; - cs-select = <0>; status = "okay"; flash@0 { @@ -188,63 +108,74 @@ #size-cells = <1>; partition@0 { - label = "0:SBL1"; - reg = <0x00 0x50000>; + label = "0:sbl1"; + reg = <0x0 0x50000>; + read-only; }; partition@50000 { - label = "0:MIBIB"; + label = "0:mibib"; reg = <0x50000 0x10000>; + read-only; }; partition@60000 { - label = "0:QSEE"; + label = "0:qsee"; reg = <0x60000 0x180000>; + read-only; }; partition@1e0000 { - label = "0:DEVCFG"; + label = "0:devcfg"; reg = <0x1e0000 0x10000>; + read-only; }; partition@1f0000 { - label = "0:APDP"; + label = "0:apdp"; reg = <0x1f0000 0x10000>; + read-only; }; partition@200000 { - label = "0:RPM"; + label = "0:rpm"; reg = <0x200000 0x40000>; + read-only; }; partition@240000 { - label = "0:CDT"; + label = "0:cdt"; reg = <0x240000 0x10000>; + read-only; }; partition@250000 { - label = "0:APPSBLENV"; + label = "0:appsblenv"; reg = <0x250000 0x10000>; }; partition@260000 { - label = "0:APPSBL"; + label = "0:appsbl"; reg = <0x260000 0xa0000>; + read-only; }; partition@300000 { - label = "0:ART"; + label = "0:art"; reg = <0x300000 0x40000>; + read-only; }; partition@340000 { - label = "0:ETHPHYFW"; + label = "0:ethphyfw"; reg = <0x340000 0x80000>; + read-only; }; partition@3c0000 { label = "product_info"; reg = <0x3c0000 0x10000>; + read-only; }; partition@3d0000 { @@ -255,15 +186,12 @@ partition@3f0000 { label = "priv_data1"; reg = <0x3f0000 0x10000>; + read-only; }; }; }; }; -&blsp1_uart3 { - status = "okay"; -}; - &blsp1_uart5 { status = "okay"; }; @@ -284,20 +212,40 @@ status = "okay"; }; +&qusb_phy_0 { + status = "okay"; +}; + +&ssphy_0 { + status = "okay"; +}; + +&usb_0 { + status = "okay"; +}; + &qpic_nand { status = "okay"; + partitions { + status = "disabled"; + }; + nand@0 { reg = <0>; - #address-cells = <0x01>; - #size-cells = <0x01>; - nand-ecc-strength = <0x04>; - nand-ecc-step-size = <0x200>; - nand-bus-width = <0x08>; + nand-ecc-strength = <4>; + nand-ecc-step-size = <512>; + nand-bus-width = <8>; - partition@0 { - label = "rootfs"; - reg = <0x00 0x8000000>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "rootfs"; + reg = <0x0000000 0x8000000>; + }; }; }; }; @@ -311,7 +259,7 @@ qca8081_24: ethernet-phy@24 { compatible = "ethernet-phy-id004d.d101"; reg = <24>; - reset-gpios = <&tlmm 25 GPIO_ACTIVE_LOW>; + reset-gpios = <&tlmm 33 GPIO_ACTIVE_LOW>; }; qca8081_28: ethernet-phy@28 { @@ -324,9 +272,10 @@ &switch { status = "okay"; - switch_lan_bmp = <0x3e>; /* lan port bitmap */ + switch_cpu_bmp = <0x1>; /* cpu port bitmap */ + switch_lan_bmp = <0x20>; /* lan port bitmap */ switch_wan_bmp = <0x40>; /* wan port bitmap */ - switch_mac_mode = <0>; /* mac mode for uniphy instance0*/ + switch_mac_mode = <0xff>; /* mac mode for uniphy instance0*/ switch_mac_mode1 = <0xf>; /* mac mode for uniphy instance1*/ switch_mac_mode2 = <0xf>; /* mac mode for uniphy instance2*/ bm_tick_mode = <0>; /* bm tick mode */ @@ -353,17 +302,17 @@ &dp5 { status = "okay"; phy-handle = <&qca8081_24>; - label = "lan"; + label = "wan"; }; &dp6 { status = "okay"; phy-handle = <&qca8081_28>; - label = "wan"; + label = "lan"; }; &wifi { status = "okay"; + qcom,ath11k-calibration-variant = "Aliyun-AP8220"; - qcom,ath11k-fw-memory-mode = <1>; }; diff --git a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh index b0c42dde0..020437137 100644 --- a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh +++ b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh @@ -10,10 +10,7 @@ platform_check_image() { platform_do_upgrade() { case "$(board_name)" in - aliyun,ap8220) - CI_UBIPART="rootfs" - nand_do_upgrade "$1" - ;; + aliyun,ap8220|\ arcadyan,aw1000|\ cmcc,rm2-6|\ compex,wpq873|\