kernel: bump 5.15 to 5.15.68

All patches automatically rebased

Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200

Signed-off-by: John Audia <therealgraysky@proton.me>

6 files changed, 53 insertions, 80 deletions

diff --git a/target/linux/airoha/patches-5.15/0001-add-airoha-platform.patch b/target/linux/airoha/patches-5.15/0001-add-airoha-platform.patch
index b1f88a6ac7..bb1104206e 100644
--- a/target/linux/airoha/patches-5.15/0001-add-airoha-platform.patch
+++ b/target/linux/airoha/patches-5.15/0001-add-airoha-platform.patch
@@ -1,11 +1,9 @@
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 66f5d6c3..05cd3385 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
 @@ -571,6 +571,18 @@ config ARCH_VIRT
-	select HAVE_ARM_ARCH_TIMER
-	select ARCH_SUPPORTS_BIG_ENDIAN
-
+ 	select HAVE_ARM_ARCH_TIMER
+ 	select ARCH_SUPPORTS_BIG_ENDIAN
+ 
 +config ARCH_AIROHA
 +	bool "Airoha SoC Support"
 +	depends on ARCH_MULTI_V7
@@ -21,11 +19,9 @@ index 66f5d6c3..05cd3385 100644
  #
  # This is sorted alphabetically by mach-* pathname.  However, plat-*
  # Kconfigs may be included either alphabetically (according to the
-diff --git a/arch/arm/Makefile b/arch/arm/Makefile
-index fa45837b..c34f7463 100644
 --- a/arch/arm/Makefile
 +++ b/arch/arm/Makefile
-@@ -156,6 +156,7 @@ textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
+@@ -156,6 +156,7 @@ textofs-$(CONFIG_ARCH_AXXIA) := 0x003080
  # Machine directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
  machine-$(CONFIG_ARCH_ACTIONS)		+= actions
diff --git a/target/linux/airoha/patches-5.15/0002-add-airoha-en7523-clk-driver.patch b/target/linux/airoha/patches-5.15/0002-add-airoha-en7523-clk-driver.patch
index 676e0f40bb..bae5cacc5e 100644
--- a/target/linux/airoha/patches-5.15/0002-add-airoha-en7523-clk-driver.patch
+++ b/target/linux/airoha/patches-5.15/0002-add-airoha-en7523-clk-driver.patch
@@ -1,11 +1,9 @@
-diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
-index c5b3dc97..c973ac1a 100644
 --- a/drivers/clk/Kconfig
 +++ b/drivers/clk/Kconfig
 @@ -192,6 +192,15 @@ config COMMON_CLK_CS2000_CP
-	help
-	  If you say yes here you get support for the CS2000 clock multiplier.
-
+ 	help
+ 	  If you say yes here you get support for the CS2000 clock multiplier.
+ 
 +config COMMON_CLK_EN7523
 +	bool "Clock driver for Airoha EN7523 SoC system clocks"
 +	depends on OF
@@ -16,13 +14,11 @@ index c5b3dc97..c973ac1a 100644
 +	  ARM silicon.
 +
  config COMMON_CLK_FSL_FLEXSPI
-	tristate "Clock driver for FlexSPI on Layerscape SoCs"
-	depends on ARCH_LAYERSCAPE || COMPILE_TEST
-diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
-index e4231212..be11d88c 100644
+ 	tristate "Clock driver for FlexSPI on Layerscape SoCs"
+ 	depends on ARCH_LAYERSCAPE || COMPILE_TEST
 --- a/drivers/clk/Makefile
 +++ b/drivers/clk/Makefile
-@@ -27,6 +27,7 @@ obj-$(CONFIG_COMMON_CLK_CDCE925)	+= clk-cdce925.o
+@@ -27,6 +27,7 @@ obj-$(CONFIG_COMMON_CLK_CDCE925)	+= clk-
  obj-$(CONFIG_ARCH_CLPS711X)		+= clk-clps711x.o
  obj-$(CONFIG_COMMON_CLK_CS2000_CP)	+= clk-cs2000-cp.o
  obj-$(CONFIG_ARCH_SPARX5)		+= clk-sparx5.o
diff --git a/target/linux/airoha/patches-5.15/0003-add-airoha-en7523-gpio-driver.patch b/target/linux/airoha/patches-5.15/0003-add-airoha-en7523-gpio-driver.patch
index 1d95e6b2c8..319336257b 100644
--- a/target/linux/airoha/patches-5.15/0003-add-airoha-en7523-gpio-driver.patch
+++ b/target/linux/airoha/patches-5.15/0003-add-airoha-en7523-gpio-driver.patch
@@ -1,11 +1,9 @@
-diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
-index cbfb6f13..b3106df6 100644
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
 @@ -247,6 +247,16 @@ config GPIO_EM
-	help
-	  Say yes here to support GPIO on Renesas Emma Mobile SoCs.
-
+ 	help
+ 	  Say yes here to support GPIO on Renesas Emma Mobile SoCs.
+ 
 +config GPIO_EN7523
 +	tristate "Airoha GPIO support"
 +	depends on ARCH_AIROHA
@@ -17,10 +15,8 @@ index cbfb6f13..b3106df6 100644
 +	  Airoha EN7523 SoC. It supports two banks of 32 GPIOs.
 +
  config GPIO_EP93XX
-	def_bool y
-	depends on ARCH_EP93XX
-diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
-index 61202717..4c73ce82 100644
+ 	def_bool y
+ 	depends on ARCH_EP93XX
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile
 @@ -57,6 +57,7 @@ obj-$(CONFIG_GPIO_DLN2)			+= gpio-dln2.o
diff --git a/target/linux/airoha/patches-5.15/0004-ARM-9124-1-uncompress-Parse-linux-usable-memory-rang.patch b/target/linux/airoha/patches-5.15/0004-ARM-9124-1-uncompress-Parse-linux-usable-memory-rang.patch
index f13ab2b0ed..0f0cbaa10f 100644
--- a/target/linux/airoha/patches-5.15/0004-ARM-9124-1-uncompress-Parse-linux-usable-memory-rang.patch
+++ b/target/linux/airoha/patches-5.15/0004-ARM-9124-1-uncompress-Parse-linux-usable-memory-rang.patch
@@ -21,11 +21,9 @@ Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
  .../arm/boot/compressed/fdt_check_mem_start.c | 48 ++++++++++++++++---
  1 file changed, 42 insertions(+), 6 deletions(-)
 
-diff --git a/arch/arm/boot/compressed/fdt_check_mem_start.c b/arch/arm/boot/compressed/fdt_check_mem_start.c
-index 62450d824c3c..9291a2661bdf 100644
 --- a/arch/arm/boot/compressed/fdt_check_mem_start.c
 +++ b/arch/arm/boot/compressed/fdt_check_mem_start.c
-@@ -55,16 +55,17 @@ static uint64_t get_val(const fdt32_t *cells, uint32_t ncells)
+@@ -55,16 +55,17 @@ static uint64_t get_val(const fdt32_t *c
   * DTB, and, if out-of-range, replace it by the real start address.
   * To preserve backwards compatibility (systems reserving a block of memory
   * at the start of physical memory, kdump, ...), the traditional method is
@@ -39,18 +37,18 @@ index 62450d824c3c..9291a2661bdf 100644
  {
 -	uint32_t addr_cells, size_cells, base;
 +	uint32_t addr_cells, size_cells, usable_base, base;
-	uint32_t fdt_mem_start = 0xffffffff;
+ 	uint32_t fdt_mem_start = 0xffffffff;
 -	const fdt32_t *reg, *endp;
 -	uint64_t size, end;
 +	const fdt32_t *usable, *reg, *endp;
 +	uint64_t size, usable_end, end;
-	const char *type;
-	int offset, len;
-
-@@ -80,6 +81,27 @@ uint32_t fdt_check_mem_start(uint32_t mem_start, const void *fdt)
-	if (addr_cells > 2 || size_cells > 2)
-		return mem_start;
-
+ 	const char *type;
+ 	int offset, len;
+ 
+@@ -80,6 +81,27 @@ uint32_t fdt_check_mem_start(uint32_t me
+ 	if (addr_cells > 2 || size_cells > 2)
+ 		return mem_start;
+ 
 +	/*
 +	 * Usable memory in case of a crash dump kernel
 +	 * This property describes a limitation: memory within this range is
@@ -72,13 +70,13 @@ index 62450d824c3c..9291a2661bdf 100644
 +		usable_end = usable_base + size;
 +	}
 +
-	/* Walk all memory nodes and regions */
-	for (offset = fdt_next_node(fdt, -1, NULL); offset >= 0;
-	     offset = fdt_next_node(fdt, offset, NULL)) {
-@@ -107,7 +129,20 @@ uint32_t fdt_check_mem_start(uint32_t mem_start, const void *fdt)
-
-			base = fdt32_ld(reg + addr_cells - 1);
-			end = base + size;
+ 	/* Walk all memory nodes and regions */
+ 	for (offset = fdt_next_node(fdt, -1, NULL); offset >= 0;
+ 	     offset = fdt_next_node(fdt, offset, NULL)) {
+@@ -107,7 +129,20 @@ uint32_t fdt_check_mem_start(uint32_t me
+ 
+ 			base = fdt32_ld(reg + addr_cells - 1);
+ 			end = base + size;
 -			if (mem_start >= base && mem_start < end) {
 +			if (usable) {
 +				/*
@@ -94,18 +92,16 @@ index 62450d824c3c..9291a2661bdf 100644
 +				if (end <= base)
 +					continue;
 +			} else if (mem_start >= base && mem_start < end) {
-				/* Calculated address is valid, use it */
-				return mem_start;
-			}
-@@ -123,7 +158,8 @@ uint32_t fdt_check_mem_start(uint32_t mem_start, const void *fdt)
-	}
-
-	/*
+ 				/* Calculated address is valid, use it */
+ 				return mem_start;
+ 			}
+@@ -123,7 +158,8 @@ uint32_t fdt_check_mem_start(uint32_t me
+ 	}
+ 
+ 	/*
 -	 * The calculated address is not usable.
 +	 * The calculated address is not usable, or was overridden by the
 +	 * "linux,usable-memory-range" property.
-	 * Use the lowest usable physical memory address from the DTB instead,
-	 * and make sure this is a multiple of 2 MiB for phys/virt patching.
-	 */
---
-2.35.1
+ 	 * Use the lowest usable physical memory address from the DTB instead,
+ 	 * and make sure this is a multiple of 2 MiB for phys/virt patching.
+ 	 */
diff --git a/target/linux/airoha/patches-5.15/0005-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch b/target/linux/airoha/patches-5.15/0005-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch
index e368acc0cf..2c590f7fab 100644
--- a/target/linux/airoha/patches-5.15/0005-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch
+++ b/target/linux/airoha/patches-5.15/0005-spi-Add-support-for-the-Airoha-EN7523-SoC-SPI-contro.patch
@@ -1,11 +1,9 @@
-diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
-index 83e352b0..5f7defe4 100644
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
 @@ -308,6 +308,12 @@ config SPI_DLN2
-	 This driver can also be built as a module.  If so, the module
-	 will be called spi-dln2.
-
+ 	 This driver can also be built as a module.  If so, the module
+ 	 will be called spi-dln2.
+ 
 +config SPI_AIROHA_EN7523
 +	bool "Airoha EN7523 SPI controller support"
 +	depends on ARCH_AIROHA
@@ -13,13 +11,11 @@ index 83e352b0..5f7defe4 100644
 +	  This enables SPI controller support for the Airoha EN7523 SoC.
 +
  config SPI_EP93XX
-	tristate "Cirrus Logic EP93xx SPI controller"
-	depends on ARCH_EP93XX || COMPILE_TEST
-diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
-index 699db95c..6c9460f7 100644
+ 	tristate "Cirrus Logic EP93xx SPI controller"
+ 	depends on ARCH_EP93XX || COMPILE_TEST
 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile
-@@ -45,6 +45,7 @@ obj-$(CONFIG_SPI_DW_BT1)		+= spi-dw-bt1.o
+@@ -45,6 +45,7 @@ obj-$(CONFIG_SPI_DW_BT1)		+= spi-dw-bt1.
  obj-$(CONFIG_SPI_DW_MMIO)		+= spi-dw-mmio.o
  obj-$(CONFIG_SPI_DW_PCI)		+= spi-dw-pci.o
  obj-$(CONFIG_SPI_EP93XX)		+= spi-ep93xx.o
@@ -27,9 +23,6 @@ index 699db95c..6c9460f7 100644
  obj-$(CONFIG_SPI_FALCON)		+= spi-falcon.o
  obj-$(CONFIG_SPI_FSI)			+= spi-fsi.o
  obj-$(CONFIG_SPI_FSL_CPM)		+= spi-fsl-cpm.o
-diff --git a/drivers/spi/spi-en7523.c b/drivers/spi/spi-en7523.c
-new file mode 100644
-index 00000000..322bf2eb
 --- /dev/null
 +++ b/drivers/spi/spi-en7523.c
 @@ -0,0 +1,311 @@
diff --git a/target/linux/airoha/patches-5.15/0006-PCI-mediatek-Allow-building-for-ARCH_AIROHA.patch b/target/linux/airoha/patches-5.15/0006-PCI-mediatek-Allow-building-for-ARCH_AIROHA.patch
index 9f51f281bc..4659809074 100644
--- a/target/linux/airoha/patches-5.15/0006-PCI-mediatek-Allow-building-for-ARCH_AIROHA.patch
+++ b/target/linux/airoha/patches-5.15/0006-PCI-mediatek-Allow-building-for-ARCH_AIROHA.patch
@@ -18,18 +18,14 @@ Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
  drivers/pci/controller/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
-index b8d96d38064d..2f6806dc2a20 100644
 --- a/drivers/pci/controller/Kconfig
 +++ b/drivers/pci/controller/Kconfig
-@@ -237,7 +237,7 @@ config PCIE_ROCKCHIP_EP
-
+@@ -233,7 +233,7 @@ config PCIE_ROCKCHIP_EP
+ 
  config PCIE_MEDIATEK
-	tristate "MediaTek PCIe controller"
+ 	tristate "MediaTek PCIe controller"
 -	depends on ARCH_MEDIATEK || COMPILE_TEST
 +	depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST
-	depends on OF
-	depends on PCI_MSI_IRQ_DOMAIN
-	help
---
-2.35.1
+ 	depends on OF
+ 	depends on PCI_MSI_IRQ_DOMAIN
+ 	help