Skip to content

Commit e48dd4c

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: x86: backport I226 support for kernel 5.4 bcm53xx: update NVMEM driver for NVRAM kernel: bump 5.15 to 5.15.68 linux-firmware: update to 20220913 kernel: bump 5.4 to 5.4.211 kernel: bump 5.10 to 5.10.143 (coolsnowwolf#10138) bcm53xx: switch to kernel 5.4
2 parents a50f894 + 39534aa commit e48dd4c

File tree

1,616 files changed

+415672
-10268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,616 files changed

+415672
-10268
lines changed

‎include/kernel-5.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .142
2-
LINUX_KERNEL_HASH-5.10.142 = 3f47ebdb9afe152a0c32c1157336ef13fa5cc08ac6d884dfc1f6ddc2b7dba268
1+
LINUX_VERSION-5.10 = .143
2+
LINUX_KERNEL_HASH-5.10.143 = fa2c9edef272d39dca52e057e1d41433cf1b6ab6a00d24a00333c0b735054e91

‎include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .67
2-
LINUX_KERNEL_HASH-5.15.67 = da47d9a80b694548835ccb553b6eb1a1f3f5d5cddd9e2bd6f4886b99ca14f940
1+
LINUX_VERSION-5.15 = .68
2+
LINUX_KERNEL_HASH-5.15.68 = 17bbb3cb5c9ba18583b6679cc28f828aec49c72abbfc6fbde310b0cb17218b7e

‎include/kernel-5.4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.4 = .203
2-
LINUX_KERNEL_HASH-5.4.203 = fc933f5b13066cfa54aacb5e86747a167bad1d8d23972e4a03ab5ee36c29798a
1+
LINUX_VERSION-5.4 = .211
2+
LINUX_KERNEL_HASH-5.4.211 = bfb43241b72cd55797af68bea1cebe630d37664c0f9a99b6e9263a63a67e2dec

‎package/firmware/linux-firmware/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=linux-firmware
11-
PKG_VERSION:=20220815
11+
PKG_VERSION:=20220913
1212
PKG_RELEASE:=1
1313

1414
PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware
1515
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
16-
PKG_HASH:=0410ef41663a9d71959ac7241b6e487359c252c3b78db0a974f61d480745e0f9
16+
PKG_HASH:=26fd00f2d8e96c4af6f44269a6b893eb857253044f75ad28ef6706a2250cd8e9
1717

1818
PKG_MAINTAINER:=Felix Fietkau <[email protected]>
1919

‎target/linux/airoha/patches-5.15/0001-add-airoha-platform.patch

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
2-
index 66f5d6c3..05cd3385 100644
31
--- a/arch/arm/Kconfig
42
+++ b/arch/arm/Kconfig
53
@@ -571,6 +571,18 @@ config ARCH_VIRT
6-
select HAVE_ARM_ARCH_TIMER
7-
select ARCH_SUPPORTS_BIG_ENDIAN
8-
4+
select HAVE_ARM_ARCH_TIMER
5+
select ARCH_SUPPORTS_BIG_ENDIAN
6+
97
+config ARCH_AIROHA
108
+ bool "Airoha SoC Support"
119
+ depends on ARCH_MULTI_V7
@@ -21,11 +19,9 @@ index 66f5d6c3..05cd3385 100644
2119
#
2220
# This is sorted alphabetically by mach-* pathname. However, plat-*
2321
# Kconfigs may be included either alphabetically (according to the
24-
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
25-
index fa45837b..c34f7463 100644
2622
--- a/arch/arm/Makefile
2723
+++ b/arch/arm/Makefile
28-
@@ -156,6 +156,7 @@ textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
24+
@@ -156,6 +156,7 @@ textofs-$(CONFIG_ARCH_AXXIA) := 0x003080
2925
# Machine directory name. This list is sorted alphanumerically
3026
# by CONFIG_* macro name.
3127
machine-$(CONFIG_ARCH_ACTIONS) += actions

‎target/linux/airoha/patches-5.15/0002-add-airoha-en7523-clk-driver.patch

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
2-
index c5b3dc97..c973ac1a 100644
31
--- a/drivers/clk/Kconfig
42
+++ b/drivers/clk/Kconfig
53
@@ -192,6 +192,15 @@ config COMMON_CLK_CS2000_CP
6-
help
7-
If you say yes here you get support for the CS2000 clock multiplier.
8-
4+
help
5+
If you say yes here you get support for the CS2000 clock multiplier.
6+
97
+config COMMON_CLK_EN7523
108
+ bool "Clock driver for Airoha EN7523 SoC system clocks"
119
+ depends on OF
@@ -16,13 +14,11 @@ index c5b3dc97..c973ac1a 100644
1614
+ ARM silicon.
1715
+
1816
config COMMON_CLK_FSL_FLEXSPI
19-
tristate "Clock driver for FlexSPI on Layerscape SoCs"
20-
depends on ARCH_LAYERSCAPE || COMPILE_TEST
21-
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
22-
index e4231212..be11d88c 100644
17+
tristate "Clock driver for FlexSPI on Layerscape SoCs"
18+
depends on ARCH_LAYERSCAPE || COMPILE_TEST
2319
--- a/drivers/clk/Makefile
2420
+++ b/drivers/clk/Makefile
25-
@@ -27,6 +27,7 @@ obj-$(CONFIG_COMMON_CLK_CDCE925) += clk-cdce925.o
21+
@@ -27,6 +27,7 @@ obj-$(CONFIG_COMMON_CLK_CDCE925) += clk-
2622
obj-$(CONFIG_ARCH_CLPS711X) += clk-clps711x.o
2723
obj-$(CONFIG_COMMON_CLK_CS2000_CP) += clk-cs2000-cp.o
2824
obj-$(CONFIG_ARCH_SPARX5) += clk-sparx5.o

‎target/linux/airoha/patches-5.15/0003-add-airoha-en7523-gpio-driver.patch

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
2-
index cbfb6f13..b3106df6 100644
31
--- a/drivers/gpio/Kconfig
42
+++ b/drivers/gpio/Kconfig
53
@@ -247,6 +247,16 @@ config GPIO_EM
6-
help
7-
Say yes here to support GPIO on Renesas Emma Mobile SoCs.
8-
4+
help
5+
Say yes here to support GPIO on Renesas Emma Mobile SoCs.
6+
97
+config GPIO_EN7523
108
+ tristate "Airoha GPIO support"
119
+ depends on ARCH_AIROHA
@@ -17,10 +15,8 @@ index cbfb6f13..b3106df6 100644
1715
+ Airoha EN7523 SoC. It supports two banks of 32 GPIOs.
1816
+
1917
config GPIO_EP93XX
20-
def_bool y
21-
depends on ARCH_EP93XX
22-
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
23-
index 61202717..4c73ce82 100644
18+
def_bool y
19+
depends on ARCH_EP93XX
2420
--- a/drivers/gpio/Makefile
2521
+++ b/drivers/gpio/Makefile
2622
@@ -57,6 +57,7 @@ obj-$(CONFIG_GPIO_DLN2) += gpio-dln2.o

‎target/linux/airoha/patches-5.15/0004-ARM-9124-1-uncompress-Parse-linux-usable-memory-rang.patch

+26-30
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ Signed-off-by: Daniel Danzberger <[email protected]>
2121
.../arm/boot/compressed/fdt_check_mem_start.c | 48 ++++++++++++++++---
2222
1 file changed, 42 insertions(+), 6 deletions(-)
2323

24-
diff --git a/arch/arm/boot/compressed/fdt_check_mem_start.c b/arch/arm/boot/compressed/fdt_check_mem_start.c
25-
index 62450d824c3c..9291a2661bdf 100644
2624
--- a/arch/arm/boot/compressed/fdt_check_mem_start.c
2725
+++ b/arch/arm/boot/compressed/fdt_check_mem_start.c
28-
@@ -55,16 +55,17 @@ static uint64_t get_val(const fdt32_t *cells, uint32_t ncells)
26+
@@ -55,16 +55,17 @@ static uint64_t get_val(const fdt32_t *c
2927
* DTB, and, if out-of-range, replace it by the real start address.
3028
* To preserve backwards compatibility (systems reserving a block of memory
3129
* at the start of physical memory, kdump, ...), the traditional method is
@@ -39,18 +37,18 @@ index 62450d824c3c..9291a2661bdf 100644
3937
{
4038
- uint32_t addr_cells, size_cells, base;
4139
+ uint32_t addr_cells, size_cells, usable_base, base;
42-
uint32_t fdt_mem_start = 0xffffffff;
40+
uint32_t fdt_mem_start = 0xffffffff;
4341
- const fdt32_t *reg, *endp;
4442
- uint64_t size, end;
4543
+ const fdt32_t *usable, *reg, *endp;
4644
+ uint64_t size, usable_end, end;
47-
const char *type;
48-
int offset, len;
49-
50-
@@ -80,6 +81,27 @@ uint32_t fdt_check_mem_start(uint32_t mem_start, const void *fdt)
51-
if (addr_cells > 2 || size_cells > 2)
52-
return mem_start;
53-
45+
const char *type;
46+
int offset, len;
47+
48+
@@ -80,6 +81,27 @@ uint32_t fdt_check_mem_start(uint32_t me
49+
if (addr_cells > 2 || size_cells > 2)
50+
return mem_start;
51+
5452
+ /*
5553
+ * Usable memory in case of a crash dump kernel
5654
+ * This property describes a limitation: memory within this range is
@@ -72,13 +70,13 @@ index 62450d824c3c..9291a2661bdf 100644
7270
+ usable_end = usable_base + size;
7371
+ }
7472
+
75-
/* Walk all memory nodes and regions */
76-
for (offset = fdt_next_node(fdt, -1, NULL); offset >= 0;
77-
offset = fdt_next_node(fdt, offset, NULL)) {
78-
@@ -107,7 +129,20 @@ uint32_t fdt_check_mem_start(uint32_t mem_start, const void *fdt)
79-
80-
base = fdt32_ld(reg + addr_cells - 1);
81-
end = base + size;
73+
/* Walk all memory nodes and regions */
74+
for (offset = fdt_next_node(fdt, -1, NULL); offset >= 0;
75+
offset = fdt_next_node(fdt, offset, NULL)) {
76+
@@ -107,7 +129,20 @@ uint32_t fdt_check_mem_start(uint32_t me
77+
78+
base = fdt32_ld(reg + addr_cells - 1);
79+
end = base + size;
8280
- if (mem_start >= base && mem_start < end) {
8381
+ if (usable) {
8482
+ /*
@@ -94,18 +92,16 @@ index 62450d824c3c..9291a2661bdf 100644
9492
+ if (end <= base)
9593
+ continue;
9694
+ } else if (mem_start >= base && mem_start < end) {
97-
/* Calculated address is valid, use it */
98-
return mem_start;
99-
}
100-
@@ -123,7 +158,8 @@ uint32_t fdt_check_mem_start(uint32_t mem_start, const void *fdt)
101-
}
102-
103-
/*
95+
/* Calculated address is valid, use it */
96+
return mem_start;
97+
}
98+
@@ -123,7 +158,8 @@ uint32_t fdt_check_mem_start(uint32_t me
99+
}
100+
101+
/*
104102
- * The calculated address is not usable.
105103
+ * The calculated address is not usable, or was overridden by the
106104
+ * "linux,usable-memory-range" property.
107-
* Use the lowest usable physical memory address from the DTB instead,
108-
* and make sure this is a multiple of 2 MiB for phys/virt patching.
109-
*/
110-
--
111-
2.35.1
105+
* Use the lowest usable physical memory address from the DTB instead,
106+
* and make sure this is a multiple of 2 MiB for phys/virt patching.
107+
*/

‎target/linux/airoha/patches-5.15/0005-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch

+6-13
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,28 @@
1-
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
2-
index 83e352b0..5f7defe4 100644
31
--- a/drivers/spi/Kconfig
42
+++ b/drivers/spi/Kconfig
53
@@ -308,6 +308,12 @@ config SPI_DLN2
6-
This driver can also be built as a module. If so, the module
7-
will be called spi-dln2.
8-
4+
This driver can also be built as a module. If so, the module
5+
will be called spi-dln2.
6+
97
+config SPI_AIROHA_EN7523
108
+ bool "Airoha EN7523 SPI controller support"
119
+ depends on ARCH_AIROHA
1210
+ help
1311
+ This enables SPI controller support for the Airoha EN7523 SoC.
1412
+
1513
config SPI_EP93XX
16-
tristate "Cirrus Logic EP93xx SPI controller"
17-
depends on ARCH_EP93XX || COMPILE_TEST
18-
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
19-
index 699db95c..6c9460f7 100644
14+
tristate "Cirrus Logic EP93xx SPI controller"
15+
depends on ARCH_EP93XX || COMPILE_TEST
2016
--- a/drivers/spi/Makefile
2117
+++ b/drivers/spi/Makefile
22-
@@ -45,6 +45,7 @@ obj-$(CONFIG_SPI_DW_BT1) += spi-dw-bt1.o
18+
@@ -45,6 +45,7 @@ obj-$(CONFIG_SPI_DW_BT1) += spi-dw-bt1.
2319
obj-$(CONFIG_SPI_DW_MMIO) += spi-dw-mmio.o
2420
obj-$(CONFIG_SPI_DW_PCI) += spi-dw-pci.o
2521
obj-$(CONFIG_SPI_EP93XX) += spi-ep93xx.o
2622
+obj-$(CONFIG_SPI_AIROHA_EN7523) += spi-en7523.o
2723
obj-$(CONFIG_SPI_FALCON) += spi-falcon.o
2824
obj-$(CONFIG_SPI_FSI) += spi-fsi.o
2925
obj-$(CONFIG_SPI_FSL_CPM) += spi-fsl-cpm.o
30-
diff --git a/drivers/spi/spi-en7523.c b/drivers/spi/spi-en7523.c
31-
new file mode 100644
32-
index 00000000..322bf2eb
3326
--- /dev/null
3427
+++ b/drivers/spi/spi-en7523.c
3528
@@ -0,0 +1,311 @@

‎target/linux/airoha/patches-5.15/0006-PCI-mediatek-Allow-building-for-ARCH_AIROHA.patch

+6-10
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,14 @@ Signed-off-by: Daniel Danzberger <[email protected]>
1818
drivers/pci/controller/Kconfig | 2 +-
1919
1 file changed, 1 insertion(+), 1 deletion(-)
2020

21-
diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
22-
index b8d96d38064d..2f6806dc2a20 100644
2321
--- a/drivers/pci/controller/Kconfig
2422
+++ b/drivers/pci/controller/Kconfig
25-
@@ -237,7 +237,7 @@ config PCIE_ROCKCHIP_EP
26-
23+
@@ -233,7 +233,7 @@ config PCIE_ROCKCHIP_EP
24+
2725
config PCIE_MEDIATEK
28-
tristate "MediaTek PCIe controller"
26+
tristate "MediaTek PCIe controller"
2927
- depends on ARCH_MEDIATEK || COMPILE_TEST
3028
+ depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST
31-
depends on OF
32-
depends on PCI_MSI_IRQ_DOMAIN
33-
help
34-
--
35-
2.35.1
29+
depends on OF
30+
depends on PCI_MSI_IRQ_DOMAIN
31+
help

‎target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ produce a noisy warning.
4343
hcd->msi_enabled = 1;
4444
--- a/drivers/usb/host/xhci.h
4545
+++ b/drivers/usb/host/xhci.h
46-
@@ -1892,6 +1892,7 @@ struct xhci_hcd {
46+
@@ -1895,6 +1895,7 @@ struct xhci_hcd {
4747
struct xhci_hub usb2_rhub;
4848
struct xhci_hub usb3_rhub;
4949
/* support xHCI 1.0 spec USB2 hardware LPM */

‎target/linux/ath25/patches-5.4/140-redboot_boardconfig.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
struct fis_image_desc {
1010
unsigned char name[16]; // Null terminated name
1111
uint32_t flash_base; // Address within FLASH of image
12-
@@ -72,6 +74,7 @@ static int parse_redboot_partitions(stru
12+
@@ -73,6 +75,7 @@ static int parse_redboot_partitions(stru
1313
const struct mtd_partition **pparts,
1414
struct mtd_part_parser_data *data)
1515
{
1616
+ unsigned long max_offset = 0;
1717
int nrparts = 0;
1818
struct fis_image_desc *buf;
1919
struct mtd_partition *parts;
20-
@@ -239,14 +242,15 @@ static int parse_redboot_partitions(stru
20+
@@ -240,14 +243,15 @@ static int parse_redboot_partitions(stru
2121
}
2222
}
2323
#endif
@@ -35,7 +35,7 @@
3535
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
3636
if (nulllen > 0) {
3737
strcpy(nullname, nullstring);
38-
@@ -265,6 +269,8 @@ static int parse_redboot_partitions(stru
38+
@@ -266,6 +270,8 @@ static int parse_redboot_partitions(stru
3939
}
4040
#endif
4141
for ( ; i<nrparts; i++) {
@@ -44,7 +44,7 @@
4444
parts[i].size = fl->img->size;
4545
parts[i].offset = fl->img->flash_base;
4646
parts[i].name = names;
47-
@@ -298,6 +304,13 @@ static int parse_redboot_partitions(stru
47+
@@ -299,6 +305,13 @@ static int parse_redboot_partitions(stru
4848
fl = fl->next;
4949
kfree(tmp_fl);
5050
}

‎target/linux/ath25/patches-5.4/141-redboot_partition_scan.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/mtd/parsers/redboot.c
22
+++ b/drivers/mtd/parsers/redboot.c
3-
@@ -93,12 +93,18 @@ static int parse_redboot_partitions(stru
3+
@@ -94,12 +94,18 @@ static int parse_redboot_partitions(stru
44

55
parse_redboot_of(master);
66

@@ -19,7 +19,7 @@
1919
return -EIO;
2020
}
2121
offset -= master->erasesize;
22-
@@ -111,10 +117,6 @@ static int parse_redboot_partitions(stru
22+
@@ -112,10 +118,6 @@ static int parse_redboot_partitions(stru
2323
goto nogood;
2424
}
2525
}
@@ -30,7 +30,7 @@
3030

3131
printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
3232
master->name, offset);
33-
@@ -187,6 +189,11 @@ static int parse_redboot_partitions(stru
33+
@@ -188,6 +190,11 @@ static int parse_redboot_partitions(stru
3434
}
3535
if (i == numslots) {
3636
/* Didn't find it */

‎target/linux/ath25/patches-5.4/142-redboot_various_erase_size_fix.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/mtd/parsers/redboot.c
22
+++ b/drivers/mtd/parsers/redboot.c
3-
@@ -70,6 +70,22 @@ static void parse_redboot_of(struct mtd_
3+
@@ -71,6 +71,22 @@ static void parse_redboot_of(struct mtd_
44
directory = dirblock;
55
}
66

@@ -23,15 +23,15 @@
2323
static int parse_redboot_partitions(struct mtd_info *master,
2424
const struct mtd_partition **pparts,
2525
struct mtd_part_parser_data *data)
26-
@@ -86,6 +102,7 @@ static int parse_redboot_partitions(stru
26+
@@ -87,6 +103,7 @@ static int parse_redboot_partitions(stru
2727
int namelen = 0;
2828
int nulllen = 0;
2929
int numslots;
3030
+ int first_slot;
3131
unsigned long offset;
3232
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
3333
static char nullstring[] = "unallocated";
34-
@@ -200,7 +217,10 @@ static int parse_redboot_partitions(stru
34+
@@ -201,7 +218,10 @@ static int parse_redboot_partitions(stru
3535
goto out;
3636
}
3737

@@ -43,7 +43,7 @@
4343
struct fis_list *new_fl, **prev;
4444

4545
if (buf[i].name[0] == 0xff) {
46-
@@ -276,12 +296,13 @@ static int parse_redboot_partitions(stru
46+
@@ -277,12 +297,13 @@ static int parse_redboot_partitions(stru
4747
}
4848
#endif
4949
for ( ; i<nrparts; i++) {
@@ -59,7 +59,7 @@
5959
strcpy(names, fl->img->name);
6060
#ifdef CONFIG_MTD_REDBOOT_PARTS_READONLY
6161
if (!memcmp(names, "RedBoot", 8) ||
62-
@@ -311,7 +332,9 @@ static int parse_redboot_partitions(stru
62+
@@ -312,7 +333,9 @@ static int parse_redboot_partitions(stru
6363
fl = fl->next;
6464
kfree(tmp_fl);
6565
}

0 commit comments

Comments
 (0)