diff --git a/target/linux/ipq40xx/patches-6.1/991-ipq40xx-unlock-cpu-frequency.patch b/target/linux/ipq40xx/patches-6.1/991-ipq40xx-unlock-cpu-frequency.patch deleted file mode 100644 index d5aa5ebc83..0000000000 --- a/target/linux/ipq40xx/patches-6.1/991-ipq40xx-unlock-cpu-frequency.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: William -Subject: [PATCH] ipq40xx: improve CPU clock -Date: Tue, 15 Dec 2020 15:26:35 +0800 - -This patch will match the clock-latency-ns values in the device tree -for those found inside the OEM device tree and kernel source code and -unlock 896Mhz CPU operating points. - -Signed-off-by: William ---- - ---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi -+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -114,20 +114,24 @@ - - opp-48000000 { - opp-hz = /bits/ 64 <48000000>; -- clock-latency-ns = <256000>; -+ clock-latency-ns = <100000>; - }; - opp-200000000 { - opp-hz = /bits/ 64 <200000000>; -- clock-latency-ns = <256000>; -+ clock-latency-ns = <100000>; - }; - opp-500000000 { - opp-hz = /bits/ 64 <500000000>; -- clock-latency-ns = <256000>; -+ clock-latency-ns = <100000>; - }; - opp-716000000 { - opp-hz = /bits/ 64 <716000000>; -- clock-latency-ns = <256000>; -+ clock-latency-ns = <100000>; - }; -+ opp-896000000 { -+ opp-hz = /bits/ 64 <896000000>; -+ clock-latency-ns = <100000>; -+ }; - }; - - memory { ---- a/drivers/clk/qcom/gcc-ipq4019.c -+++ b/drivers/clk/qcom/gcc-ipq4019.c -@@ -579,6 +579,9 @@ static const struct freq_tbl ftbl_gcc_ap - F(632000000, P_DDRPLLAPSS, 1, 0, 0), - F(672000000, P_DDRPLLAPSS, 1, 0, 0), - F(716000000, P_DDRPLLAPSS, 1, 0, 0), -+ F(768000000, P_DDRPLLAPSS, 1, 0, 0), -+ F(823000000, P_DDRPLLAPSS, 1, 0, 0), -+ F(896000000, P_DDRPLLAPSS, 1, 0, 0), - { } - }; - diff --git a/target/linux/ipq806x/files-6.1/arch/arm/boot/dts/qcom-ipq8064-mi-router-hd.dts b/target/linux/ipq806x/files-6.1/arch/arm/boot/dts/qcom-ipq8064-mi-router-hd.dts deleted file mode 100644 index 5aca8c3ed5..0000000000 --- a/target/linux/ipq806x/files-6.1/arch/arm/boot/dts/qcom-ipq8064-mi-router-hd.dts +++ /dev/null @@ -1,551 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "qcom-ipq8064-v2.0-smb208.dtsi" - -#include -#include - -/ { - model = "Xiaomi Mi Router HD"; - compatible = "xiaomi,mi-router-hd", "qcom,ipq8064"; - - memory@0 { - device_type = "memory"; - reg = <0x42000000 0x1e000000>; - }; - - reserved-memory { - rsvd@44600000 { - reg = <0x44600000 0x200000>; /* IPQ_TZ_APPS_ADDR */ - no-map; - }; - }; - - aliases { - label-mac-device = &gmac1; - - mdio-gpio0 = &mdio0; - - led-boot = &led_status_yellow; - led-failsafe = &led_status_red; - led-running = &led_status_blue; - led-upgrade = &led_status_yellow; - }; - - chosen { - bootargs = "rootfstype=squashfs noinitrd"; - }; - - keys { - compatible = "gpio-keys"; - pinctrl-0 = <&button_pins>; - pinctrl-names = "default"; - - reset { - label = "reset"; - gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>; - linux,code = ; - debounce-interval = <60>; - wakeup-source; - }; - - power { - label = "power"; /* Labeled POWER on the device, but using for sleep mode */ - gpios = <&qcom_pinmux 68 GPIO_ACTIVE_LOW>; - linux,code = ; - debounce-interval = <60>; - wakeup-source; - }; - }; - - leds { - compatible = "gpio-leds"; - pinctrl-0 = <&led_pins>; - pinctrl-names = "default"; - - led_status_red: led_status_red { - function = LED_FUNCTION_STATUS; - color = ; - gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; - default-state = "keep"; - }; - - led_status_blue: led_status_blue { - function = LED_FUNCTION_STATUS; - color = ; - gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; - default-state = "keep"; - }; - - led_status_yellow: led_status_yellow { - function = LED_FUNCTION_STATUS; - color = ; - gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; - default-state = "keep"; - }; - }; - - i2c_gpio_0 { // GSBI1 - compatible = "i2c-gpio"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&i2c1_pins>; - pinctrl-names = "default"; - sda-gpios = <&qcom_pinmux 53 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - scl-gpios = <&qcom_pinmux 54 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - i2c-gpio,delay-us = <5>; - - emc2301@2f { - compatible = "smsc,emc2301"; - reg = <0x2f>; - #address-cells = <1>; - #size-cells = <0>; - - fan@0 { - reg = <0>; - pwm-output-mode = <1>; - }; - }; - }; - - i2c_gpio_1 { // GSBI2 - compatible = "i2c-gpio"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&i2c2_pins>; - pinctrl-names = "default"; - sda-gpios = <&qcom_pinmux 24 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - scl-gpios = <&qcom_pinmux 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - i2c-gpio,delay-us = <5>; - - tmp75@48 { - compatible = "ti,tmp75"; - reg = <0x48>; - #address-cells = <1>; - #size-cells = <0>; - #thermal-sensor-cells = <0>; - status = "okay"; - }; - }; -}; - -// https://github.com/openwrt/openwrt/commit/622ce713ca246aa465bf28d2a743f96999085ea2 -// https://github.com/openwrt/openwrt/commit/2336c2dbb1929837f7e42d4315c8073342a5b46b -// https://forum.openwrt.org/t/failed-to-startup-an-ipq806x-router-on-kernel-5-4/60775/41 -&CPU_SPC { - status = "disabled"; -}; - -&adm_dma { - status = "okay"; -}; - -&qcom_pinmux { - i2c1_pins: i2c1_pins { // GSBI1 - EMC2301 - mux { - pins = "gpio53", "gpio54"; - function = "gsbi1"; - drive-strength = <12>; - bias-none; - input; - }; - }; - - i2c2_pins: i2c2_pins { // GSBI2 - TMP75 - mux { - pins = "gpio24", "gpio25"; - function = "gsbi2"; - drive-strength = <12>; - bias-none; - input; - }; - }; - - button_pins: button_pins { - mux { - pins = "gpio16", "gpio68"; - function = "gpio"; - drive-strength = <2>; - bias-pull-up; - }; - }; - - led_pins: led_pins { - mux { - pins = "gpio7", "gpio8", "gpio9"; - function = "gpio"; - drive-strength = <2>; - bias-pull-up; - }; - }; - - usb_pwr_en_pins: usb_pwr_en_pins { - mux { - pins = "gpio56"; - function = "gpio"; - drive-strength = <12>; - bias-pull-up; - output-high; - }; - }; -}; - -&sata_phy { - status = "okay"; -}; - -&sata { - status = "okay"; -}; - -&usb3_0 { - status = "okay"; -}; - -&usb3_1 { - status = "okay"; - pinctrl-0 = <&usb_pwr_en_pins>; - pinctrl-names = "default"; -}; - -&pcie0 { - status = "okay"; - reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>; - pinctrl-0 = <&pcie0_pins>; - pinctrl-names = "default"; - - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - - wifi@1,0 { - compatible = "pci168c,0040"; - reg = <0x00010000 0 0 0 0>; - - nvmem-cells = <&macaddr_art_1006 0>, <&precal_art_1000>; - nvmem-cell-names = "mac-address", "pre-calibration"; - }; - }; -}; - -&pcie1 { - status = "okay"; - reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>; - pinctrl-0 = <&pcie1_pins>; - pinctrl-names = "default"; - max-link-speed = <1>; - - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; - - wifi@1,0 { - compatible = "pci168c,0040"; - reg = <0x00010000 0 0 0 0>; - - nvmem-cells = <&macaddr_art_5006 0>, <&precal_art_5000>; - nvmem-cell-names = "mac-address", "pre-calibration"; - }; - }; -}; - -&nand { - status = "okay"; - - nand@0 { - reg = <0>; - compatible = "qcom,nandcs"; - - nand-bus-width = <8>; - nand-ecc-strength = <4>; - nand-ecc-step-size = <512>; - - nand-is-boot-medium; - qcom,boot_pages_size = <0xf0000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "SBL1"; - reg = <0x0 0x40000>; - read-only; - }; - - partition@40000 { - label = "MIBIB"; - reg = <0x40000 0x80000>; - read-only; - }; - - partition@c0000 { - label = "SBL2"; - reg = <0xc0000 0x80000>; - read-only; - }; - - partition@140000 { - label = "SBL3"; - reg = <0x140000 0x80000>; - read-only; - }; - - partition@1c0000 { - label = "DDRCONFIG"; - reg = <0x1c0000 0x80000>; - read-only; - }; - - partition@240000 { - label = "SSD"; - reg = <0x240000 0x80000>; - read-only; - }; - - partition@2c0000 { - label = "TZ"; - reg = <0x2c0000 0x80000>; - read-only; - }; - - partition@340000 { - label = "RPM"; - reg = <0x340000 0x80000>; - read-only; - }; - - partition@3c0000 { - label = "APPSBL"; - reg = <0x3c0000 0x100000>; - read-only; - }; - - partition@4c0000 { - label = "APPSBLENV"; - reg = <0x4c0000 0x80000>; - }; - - art: partition@540000 { - label = "ART"; - reg = <0x540000 0x80000>; - read-only; - - compatible = "nvmem-cells"; - nvmem-layout { - compatible = "fixed-layout"; - #address-cells = <1>; - #size-cells = <1>; - - macaddr_art_0: macaddr@0 { - compatible = "mac-base"; - reg = <0x0 0x6>; - #nvmem-cell-cells = <1>; - }; - - macaddr_art_6: macaddr@6 { - compatible = "mac-base"; - reg = <0x6 0x6>; - #nvmem-cell-cells = <1>; - }; - - macaddr_art_1006: macaddr@1006 { - compatible = "mac-base"; - reg = <0x1006 0x6>; - #nvmem-cell-cells = <1>; - }; - - macaddr_art_5006: macaddr@5006 { - compatible = "mac-base"; - reg = <0x5006 0x6>; - #nvmem-cell-cells = <1>; - }; - - precal_art_1000: precal@1000 { - reg = <0x1000 0x2f20>; - }; - - precal_art_5000: precal@5000 { - reg = <0x5000 0x2f20>; - }; - }; - }; - - partition@5c0000 { - label = "BOOTCONFIG"; - reg = <0x5c0000 0x40000>; - read-only; - }; - - partition@600000 { - label = "bdata"; - reg = <0x600000 0x80000>; - }; - - partition@680000 { - label = "crash"; - reg = <0x680000 0x80000>; - read-only; - }; - - partition@700000 { - label = "crash_syslog"; - reg = <0x700000 0x80000>; - read-only; - }; - - partition@780000 { - label = "rsvd"; - reg = <0x780000 0x80000>; - read-only; - }; - - /* Stock U-Boot support Dual Boot */ - partition@800000 { - label = "kernel_dup"; - reg = <0x800000 0x400000>; - }; - - partition@c00000 { - label = "kernel"; - reg = <0xc00000 0x400000>; - }; - - partition@1000000 { - label = "ubi"; - reg = <0x1000000 0xf000000>; - }; - }; - }; -}; - -&mdio0 { - status = "okay"; - - pinctrl-0 = <&mdio0_pins>; - pinctrl-names = "default"; - - switch@10 { - compatible = "qca,qca8337"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x10>; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - label = "cpu"; - ethernet = <&gmac1>; - phy-mode = "rgmii"; - tx-internal-delay-ps = <1000>; - rx-internal-delay-ps = <1000>; - - fixed-link { - speed = <1000>; - full-duplex; - }; - }; - - port@1 { - reg = <1>; - label = "lan3"; - phy-mode = "internal"; - phy-handle = <&phy_port1>; - }; - - port@2 { - reg = <2>; - label = "lan2"; - phy-mode = "internal"; - phy-handle = <&phy_port2>; - }; - - port@3 { - reg = <3>; - label = "lan1"; - phy-mode = "internal"; - phy-handle = <&phy_port3>; - }; - - port@5 { - reg = <5>; - label = "wan"; - phy-mode = "internal"; - phy-handle = <&phy_port5>; - }; - - port@6 { - reg = <6>; - label = "cpu"; - ethernet = <&gmac2>; - phy-mode = "sgmii"; - qca,sgmii-enable-pll; - - fixed-link { - speed = <1000>; - full-duplex; - }; - }; - }; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - - phy_port1: phy@0 { - reg = <0>; - }; - - phy_port2: phy@1 { - reg = <1>; - }; - - phy_port3: phy@2 { - reg = <2>; - }; - - phy_port5: phy@4 { - reg = <4>; - }; - }; - }; -}; - -&gmac1 { - status = "okay"; - phy-mode = "rgmii"; - qcom,id = <1>; - - pinctrl-0 = <&rgmii2_pins>; - pinctrl-names = "default"; - - nvmem-cells = <&macaddr_art_0 0>; - nvmem-cell-names = "mac-address"; - - fixed-link { - speed = <1000>; - full-duplex; - }; -}; - -&gmac2 { - status = "okay"; - phy-mode = "sgmii"; - qcom,id = <2>; - - nvmem-cells = <&macaddr_art_6 0>; - nvmem-cell-names = "mac-address"; - - fixed-link { - speed = <1000>; - full-duplex; - }; -}; diff --git a/target/linux/ipq806x/files-6.1/arch/arm/boot/dts/qcom-ipq8064-rg-mtfi-m520.dts b/target/linux/ipq806x/files-6.1/arch/arm/boot/dts/qcom-ipq8064-rg-mtfi-m520.dts deleted file mode 100644 index 71c3070ebd..0000000000 --- a/target/linux/ipq806x/files-6.1/arch/arm/boot/dts/qcom-ipq8064-rg-mtfi-m520.dts +++ /dev/null @@ -1,375 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "qcom-ipq8064-v2.0-smb208.dtsi" - -#include -#include - -/ { - model = "Ruijie RG-MTFi-M520"; - compatible = "ruijie,rg-mtfi-m520", "qcom,ipq8064"; - - memory@0 { - reg = <0x42000000 0x7e000000>; - device_type = "memory"; - }; - - aliases { - mdio-gpio0 = &mdio0; - sdcc1 = &sdcc1; - - led-boot = &led_sys; - led-failsafe = &led_sys; - led-running = &led_sys; - led-upgrade = &led_sys; - }; - - chosen { - bootargs = "root=/dev/mmcblk0p3 rootfstype=squashfs,ext4 rootwait noinitrd"; - }; - - leds { - compatible = "gpio-leds"; - - led_sys: sys { - function = LED_FUNCTION_STATUS; - color = ; - gpios = <&gpio_ext 15 GPIO_ACTIVE_LOW>; - }; - }; - - keys { - compatible = "gpio-keys"; - pinctrl-0 = <&button_pins>; - pinctrl-names = "default"; - - reset { - label = "reset"; - gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; -}; - -&qcom_pinmux { - button_pins: button_pins { - mux { - pins = "gpio54"; - function = "gpio"; - drive-strength = <2>; - bias-pull-up; - }; - }; - - mdio0_pins: mdio0-pins { - clk { - pins = "gpio1"; - input-disable; - }; - }; - - rgmii2_pins: rgmii2-pins { - tx { - pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32"; - input-disable; - }; - }; - - sdcc1_pins: sdcc1_pinmux { - mux { - pins = "gpio38", "gpio39", "gpio40", "gpio41", "gpio42", - "gpio43", "gpio44", "gpio45", "gpio46", "gpio47"; - function = "sdc1"; - }; - - cmd { - pins = "gpio45"; - drive-strength = <10>; - bias-pull-up; - }; - - data { - pins = "gpio38", "gpio39", "gpio40", "gpio41", - "gpio43", "gpio44", "gpio46", "gpio47"; - drive-strength = <10>; - bias-pull-up; - }; - - clk { - pins = "gpio42"; - drive-strength = <16>; - bias-disable; - }; - }; - - spi_pins: spi_pins { - cs { - pins = "gpio20"; - drive-strength = <12>; - }; - }; -}; - -&gsbi2 { - qcom,mode = ; - status = "okay"; - - i2c@124a0000 { - status = "okay"; - - lm75@48 { - compatible = "lm75"; - reg = <0x48>; - }; - - pcf8563: rtc@51 { - compatible = "nxp,pcf8563"; - reg = <0x51>; - }; - - gpio_ext: tca9539@74 { - compatible = "ti,tca9539"; - reg = <0x74>; - - gpio-controller; - #gpio-cells = <2>; - }; - }; -}; - -&gsbi5 { - qcom,mode = ; - status = "okay"; - - spi4: spi@1a280000 { - status = "okay"; - - pinctrl-0 = <&spi_pins>; - pinctrl-names = "default"; - - cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; - - m25p80@0 { - compatible = "s25fl256s1"; - #address-cells = <1>; - #size-cells = <1>; - spi-max-frequency = <50000000>; - reg = <0>; - - SBL1@0 { - label = "SBL1"; - reg = <0x0 0x10000>; - read-only; - }; - - MIBIB@10000 { - label = "MIBIB"; - reg = <0x10000 0x10000>; - read-only; - }; - - SBL2@20000 { - label = "SBL2"; - reg = <0x20000 0x20000>; - read-only; - }; - - SBL3@40000 { - label = "SBL3"; - reg = <0x40000 0x30000>; - read-only; - }; - - DDRCONFIG@70000 { - label = "DDRCONFIG"; - reg = <0x70000 0x10000>; - read-only; - }; - - PRODUCTINFO@80000 { - label = "PRODUCTINFO"; - reg = <0x80000 0x10000>; - read-only; - }; - - TZ@90000 { - label = "TZ"; - reg = <0x90000 0x30000>; - read-only; - }; - - RPM@c0000 { - label = "RPM"; - reg = <0xc0000 0x20000>; - read-only; - }; - - APPSBL@e0000 { - label = "APPSBL"; - reg = <0xe0000 0x80000>; - read-only; - }; - - APPSBLENV@160000 { - label = "APPSBLENV"; - reg = <0x160000 0x10000>; - read-only; - }; - - BOOTCONFIG@170000 { - label = "BOOTCONFIG"; - reg = <0x170000 0x10000>; - read-only; - }; - - ART@180000 { - label = "ART"; - reg = <0x180000 0x40000>; - read-only; - }; - }; - }; -}; - -&sata_phy { - status = "okay"; -}; - -&sata { - status = "okay"; -}; - -&usb3_0 { - status = "okay"; -}; - -&usb3_1 { - status = "okay"; -}; - -&pcie0 { - status = "okay"; - reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_HIGH>; - pinctrl-0 = <&pcie0_pins>; - pinctrl-names = "default"; -}; - -&pcie1 { - status = "okay"; - reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_HIGH>; - pinctrl-0 = <&pcie1_pins>; - pinctrl-names = "default"; - max-link-speed = <1>; -}; - -&mdio0 { - status = "okay"; - - pinctrl-0 = <&mdio0_pins>; - pinctrl-names = "default"; - - switch@10 { - compatible = "qca,qca8337"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x10>; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - label = "cpu"; - ethernet = <&gmac1>; - phy-mode = "rgmii"; - tx-internal-delay-ps = <1000>; - rx-internal-delay-ps = <1000>; - - fixed-link { - speed = <1000>; - full-duplex; - }; - }; - - port@1 { - reg = <1>; - label = "lan1"; - phy-mode = "internal"; - phy-handle = <&phy_port1>; - }; - - port@5 { - reg = <5>; - label = "wan"; - phy-mode = "internal"; - phy-handle = <&phy_port5>; - }; - - port@6 { - reg = <6>; - label = "cpu"; - ethernet = <&gmac2>; - phy-mode = "sgmii"; - qca,sgmii-enable-pll; - - fixed-link { - speed = <1000>; - full-duplex; - }; - }; - }; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - - phy_port1: phy@0 { - reg = <0>; - }; - - phy_port5: phy@4 { - reg = <4>; - }; - }; - }; -}; - -&gmac1 { - status = "okay"; - phy-mode = "rgmii"; - qcom,id = <1>; - - pinctrl-0 = <&rgmii2_pins>; - pinctrl-names = "default"; - - fixed-link { - speed = <1000>; - full-duplex; - }; -}; - -&gmac2 { - status = "okay"; - phy-mode = "sgmii"; - qcom,id = <2>; - - fixed-link { - speed = <1000>; - full-duplex; - }; -}; - -&sdcc1 { - status = "okay"; - pinctrl-0 = <&sdcc1_pins>; - pinctrl-names = "default"; -}; - -&adm_dma { - status = "okay"; -}; - -&CPU_SPC { - status = "disabled"; -};