forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: mac80211: fixes build on kernel 6.0 rockchip: add support for Radxa ROCK Pi E25 Revert "kernel: add support for rtl88x2bu driver" build: add support for python3.11 and higher (coolsnowwolf#10392)
- Loading branch information
Showing
17 changed files
with
867 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
148 changes: 148 additions & 0 deletions
148
...e/boot/uboot-rockchip/patches/311-rockchip-rk3568-Add-support-for-radxa_rock-pi-e25.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| --- a/arch/arm/dts/Makefile | ||
| +++ b/arch/arm/dts/Makefile | ||
| @@ -174,7 +174,8 @@ rk3568-evb.dtb \ | ||
| rk3568-mrkaio-m68s.dtb \ | ||
| rk3568-nanopi-r5s.dtb \ | ||
| rk3566-quartz64-a.dtb \ | ||
| - rk3568-rock-3a.dtb | ||
| + rk3568-rock-3a.dtb \ | ||
| + rk3568-rock-pi-e25.dtb | ||
|
|
||
| dtb-$(CONFIG_ROCKCHIP_RV1108) += \ | ||
| rv1108-elgin-r1.dtb \ | ||
| --- /dev/null | ||
| +++ b/arch/arm/dts/rk3568-rock-pi-e25-u-boot.dtsi | ||
| @@ -0,0 +1,21 @@ | ||
| +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| + | ||
| +#include "rk3568-u-boot.dtsi" | ||
| + | ||
| +/ { | ||
| + chosen { | ||
| + stdout-path = &uart2; | ||
| + u-boot,spl-boot-order = "same-as-spl", &sdmmc0, &sdhci; | ||
| + }; | ||
| +}; | ||
| + | ||
| +&sdmmc0 { | ||
| + bus-width = <4>; | ||
| + u-boot,spl-fifo-mode; | ||
| +}; | ||
| + | ||
| +&uart2 { | ||
| + u-boot,dm-spl; | ||
| + clock-frequency = <24000000>; | ||
| + status = "okay"; | ||
| +}; | ||
| --- /dev/null | ||
| +++ b/arch/arm/dts/rk3568-rock-pi-e25.dts | ||
| @@ -0,0 +1,8 @@ | ||
| +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
| + | ||
| +#include "rk3568-evb.dts" | ||
| + | ||
| +/ { | ||
| + model = "Radxa ROCK Pi E25"; | ||
| + compatible = "radxa,rockpi-e25", "rockchip,rk3568"; | ||
| +}; | ||
| --- /dev/null | ||
| +++ b/configs/rock-pi-e25-rk3568_defconfig | ||
| @@ -0,0 +1,98 @@ | ||
| +CONFIG_ARM=y | ||
| +CONFIG_SKIP_LOWLEVEL_INIT=y | ||
| +CONFIG_ARCH_ROCKCHIP=y | ||
| +CONFIG_SYS_TEXT_BASE=0x00a00000 | ||
| +CONFIG_SPL_LIBCOMMON_SUPPORT=y | ||
| +CONFIG_SPL_LIBGENERIC_SUPPORT=y | ||
| +CONFIG_NR_DRAM_BANKS=2 | ||
| +CONFIG_DEFAULT_DEVICE_TREE="rk3568-rock-pi-e25" | ||
| +CONFIG_ROCKCHIP_RK3568=y | ||
| +CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y | ||
| +CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y | ||
| +CONFIG_SPL_MMC=y | ||
| +CONFIG_SPL_SERIAL=y | ||
| +CONFIG_SPL_STACK_R_ADDR=0x600000 | ||
| +CONFIG_TARGET_EVB_RK3568=y | ||
| +CONFIG_DEBUG_UART_BASE=0xFE660000 | ||
| +CONFIG_DEBUG_UART_CLOCK=24000000 | ||
| +CONFIG_DEBUG_UART=y | ||
| +CONFIG_SYS_LOAD_ADDR=0xc00800 | ||
| +CONFIG_API=y | ||
| +CONFIG_FIT=y | ||
| +CONFIG_FIT_VERBOSE=y | ||
| +CONFIG_SPL_LOAD_FIT=y | ||
| +CONFIG_OF_SYSTEM_SETUP=y | ||
| +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-rock-pi-e25.dtb" | ||
| +# CONFIG_SYS_DEVICE_NULLDEV is not set | ||
| +CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1 | ||
| +# CONFIG_DISPLAY_CPUINFO is not set | ||
| +CONFIG_DISPLAY_BOARDINFO_LATE=y | ||
| +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set | ||
| +CONFIG_SPL_STACK_R=y | ||
| +CONFIG_SPL_SEPARATE_BSS=y | ||
| +CONFIG_SPL_ATF=y | ||
| +CONFIG_SPL_ATF_LOAD_IMAGE_V2=y | ||
| +CONFIG_CMD_BIND=y | ||
| +CONFIG_CMD_CLK=y | ||
| +CONFIG_CMD_GPIO=y | ||
| +CONFIG_CMD_GPT=y | ||
| +CONFIG_CMD_I2C=y | ||
| +CONFIG_CMD_MMC=y | ||
| +CONFIG_CMD_USB=y | ||
| +# CONFIG_CMD_SETEXPR is not set | ||
| +CONFIG_CMD_PMIC=y | ||
| +CONFIG_CMD_REGULATOR=y | ||
| +# CONFIG_SPL_DOS_PARTITION is not set | ||
| +CONFIG_SPL_OF_CONTROL=y | ||
| +CONFIG_OF_LIVE=y | ||
| +CONFIG_NET_RANDOM_ETHADDR=y | ||
| +CONFIG_SPL_DM_WARN=y | ||
| +CONFIG_SPL_REGMAP=y | ||
| +CONFIG_SPL_SYSCON=y | ||
| +CONFIG_SPL_CLK=y | ||
| +CONFIG_ROCKCHIP_GPIO=y | ||
| +CONFIG_ROCKCHIP_GPIO_V2=y | ||
| +CONFIG_SYS_I2C_ROCKCHIP=y | ||
| +CONFIG_MISC=y | ||
| +CONFIG_MMC_HS200_SUPPORT=y | ||
| +CONFIG_SPL_MMC_HS200_SUPPORT=y | ||
| +CONFIG_MMC_DW=y | ||
| +CONFIG_MMC_DW_ROCKCHIP=y | ||
| +CONFIG_MMC_SDHCI=y | ||
| +CONFIG_MMC_SDHCI_SDMA=y | ||
| +CONFIG_MMC_SDHCI_ROCKCHIP=y | ||
| +CONFIG_DM_ETH=y | ||
| +CONFIG_ETH_DESIGNWARE=y | ||
| +CONFIG_GMAC_ROCKCHIP=y | ||
| +CONFIG_POWER_DOMAIN=y | ||
| +CONFIG_DM_PMIC=y | ||
| +CONFIG_PMIC_RK8XX=y | ||
| +CONFIG_SPL_PMIC_RK8XX=y | ||
| +CONFIG_REGULATOR_PWM=y | ||
| +CONFIG_DM_REGULATOR_FIXED=y | ||
| +CONFIG_SPL_DM_REGULATOR_FIXED=y | ||
| +CONFIG_DM_REGULATOR_GPIO=y | ||
| +CONFIG_REGULATOR_RK8XX=y | ||
| +CONFIG_PWM_ROCKCHIP=y | ||
| +CONFIG_SPL_RAM=y | ||
| +CONFIG_DM_RESET=y | ||
| +CONFIG_BAUDRATE=1500000 | ||
| +CONFIG_DEBUG_UART_SHIFT=2 | ||
| +CONFIG_SYSRESET=y | ||
| +CONFIG_SYSRESET_PSCI=y | ||
| +CONFIG_USB=y | ||
| +CONFIG_USB_XHCI_HCD=y | ||
| +CONFIG_USB_XHCI_DWC3=y | ||
| +CONFIG_USB_EHCI_HCD=y | ||
| +CONFIG_USB_EHCI_GENERIC=y | ||
| +CONFIG_USB_OHCI_HCD=y | ||
| +CONFIG_USB_OHCI_GENERIC=y | ||
| +CONFIG_USB_DWC3=y | ||
| +CONFIG_USB_DWC3_GENERIC=y | ||
| +CONFIG_ROCKCHIP_USB2_PHY=y | ||
| +CONFIG_USB_KEYBOARD=y | ||
| +CONFIG_USB_HOST_ETHER=y | ||
| +CONFIG_USB_ETHER_LAN75XX=y | ||
| +CONFIG_USB_ETHER_LAN78XX=y | ||
| +CONFIG_USB_ETHER_SMSC95XX=y | ||
| +CONFIG_ERRNO_STR=y |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
...age/kernel/mac80211/patches/subsys/250-drivers-make-clear-mmc_hw_reset-is-for-cards.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| --- a/drivers/net/wireless/ath/ath10k/sdio.c | ||
| +++ b/drivers/net/wireless/ath/ath10k/sdio.c | ||
| @@ -1633,7 +1633,11 @@ static void ath10k_sdio_hif_power_down(struct ath10k *ar) | ||
| return; | ||
| } | ||
|
|
||
| +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) | ||
| ret = mmc_hw_reset(ar_sdio->func->card->host); | ||
| +#else | ||
| + ret = mmc_hw_reset(ar_sdio->func->card); | ||
| +#endif | ||
| if (ret) | ||
| ath10k_warn(ar, "unable to reset sdio: %d\n", ret); | ||
|
|
||
| --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | ||
| +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | ||
| @@ -4164,7 +4164,11 @@ static int brcmf_sdio_bus_reset(struct device *dev) | ||
|
|
||
| /* reset the adapter */ | ||
| sdio_claim_host(sdiodev->func1); | ||
| +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) | ||
| mmc_hw_reset(sdiodev->func1->card->host); | ||
| +#else | ||
| + mmc_hw_reset(sdiodev->func1->card); | ||
| +#endif | ||
| sdio_release_host(sdiodev->func1); | ||
|
|
||
| brcmf_bus_change_state(sdiodev->bus_if, BRCMF_BUS_DOWN); | ||
| --- a/drivers/net/wireless/marvell/mwifiex/sdio.c | ||
| +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c | ||
| @@ -2643,7 +2643,11 @@ static void mwifiex_sdio_card_reset_work(struct mwifiex_adapter *adapter) | ||
|
|
||
| /* Run a HW reset of the SDIO interface. */ | ||
| sdio_claim_host(func); | ||
| +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) | ||
| ret = mmc_hw_reset(func->card->host); | ||
| +#else | ||
| + ret = mmc_hw_reset(func->card); | ||
| +#endif | ||
| sdio_release_host(func); | ||
|
|
||
| switch (ret) { | ||
| --- a/drivers/net/wireless/ti/wlcore/sdio.c | ||
| +++ b/drivers/net/wireless/ti/wlcore/sdio.c | ||
| @@ -146,7 +146,11 @@ static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue) | ||
| * To guarantee that the SDIO card is power cycled, as required to make | ||
| * the FW programming to succeed, let's do a brute force HW reset. | ||
| */ | ||
| +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) | ||
| mmc_hw_reset(card->host); | ||
| +#else | ||
| + mmc_hw_reset(card); | ||
| +#endif | ||
|
|
||
| sdio_enable_func(func); | ||
| sdio_release_host(func); |
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
package/kernel/rtl88x2bu/patches/001-use-kernel-byteorder.patch
This file was deleted.
Oops, something went wrong.
31 changes: 0 additions & 31 deletions
31
package/kernel/rtl88x2bu/patches/002-use-kernel-wireless-header.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.