From fc70c736082d699afa066da6bae8ab2428570bf1 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Sun, 22 Jan 2023 10:39:59 +0300 Subject: [PATCH] sunxi: switch CURRENT to v5.15.89, EDGE to v6.1.7 (#4724) --- .../families/include/sunxi64_common.inc | 4 ++-- .../sources/families/include/sunxi_common.inc | 4 ++-- .../mtd-spi-nor-Add-regulator-support.patch | 22 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 8b3ed32e3..e151ffbed 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -18,12 +18,12 @@ case $BRANCH in current) KERNEL_VERSION_LEVEL="5.15" - KERNELSWITCHOBJ="tag=v5.15.88" + KERNELSWITCHOBJ="tag=v5.15.89" ;; edge) KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-6.1} - KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v6.1.6'} + KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v6.1.7'} ;; esac diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index abb8c78a9..109d67e80 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -18,11 +18,11 @@ case $BRANCH in ;; current) KERNEL_VERSION_LEVEL="5.15" - KERNELSWITCHOBJ="tag=v5.15.88" + KERNELSWITCHOBJ="tag=v5.15.89" ;; edge) KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-6.1} - KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v6.1.6'} + KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v6.1.7'} ;; esac diff --git a/patch/kernel/archive/sunxi-6.1/patches.megous/mtd-spi-nor-Add-regulator-support.patch b/patch/kernel/archive/sunxi-6.1/patches.megous/mtd-spi-nor-Add-regulator-support.patch index f1e46732c..9ebc61242 100644 --- a/patch/kernel/archive/sunxi-6.1/patches.megous/mtd-spi-nor-Add-regulator-support.patch +++ b/patch/kernel/archive/sunxi-6.1/patches.megous/mtd-spi-nor-Add-regulator-support.patch @@ -1,7 +1,7 @@ -From 51a0a52ec5b196fe759383496f3934674a61624d Mon Sep 17 00:00:00 2001 +From 6df41298dc6daf80b59fc174c9644d0ab730ea73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Mon, 30 Sep 2019 11:49:54 +0200 -Subject: [PATCH 059/389] mtd: spi-nor: Add regulator support +Subject: [PATCH] mtd: spi-nor: Add regulator support Signed-off-by: Ondrej Jirman --- @@ -10,10 +10,10 @@ Signed-off-by: Ondrej Jirman 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c -index bee8fc4c9f07..ef2482a15b22 100644 +index 5dbf52aa0..39241ed62 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -3099,6 +3099,22 @@ static int spi_nor_probe(struct spi_mem *spimem) +@@ -3103,6 +3103,22 @@ static int spi_nor_probe(struct spi_mem *spimem) if (!nor) return -ENOMEM; @@ -36,7 +36,7 @@ index bee8fc4c9f07..ef2482a15b22 100644 nor->spimem = spimem; nor->dev = &spi->dev; spi_nor_set_flash_node(nor, spi->dev.of_node); -@@ -3126,7 +3142,7 @@ static int spi_nor_probe(struct spi_mem *spimem) +@@ -3130,7 +3146,7 @@ static int spi_nor_probe(struct spi_mem *spimem) ret = spi_nor_scan(nor, flash_name, &hwcaps); if (ret) @@ -45,7 +45,7 @@ index bee8fc4c9f07..ef2482a15b22 100644 spi_nor_debugfs_register(nor); -@@ -3141,20 +3157,28 @@ static int spi_nor_probe(struct spi_mem *spimem) +@@ -3145,20 +3161,28 @@ static int spi_nor_probe(struct spi_mem *spimem) nor->bouncebuf = devm_kmalloc(nor->dev, nor->bouncebuf_size, GFP_KERNEL); @@ -79,7 +79,7 @@ index bee8fc4c9f07..ef2482a15b22 100644 } static int spi_nor_remove(struct spi_mem *spimem) -@@ -3162,6 +3186,7 @@ static int spi_nor_remove(struct spi_mem *spimem) +@@ -3166,6 +3190,7 @@ static int spi_nor_remove(struct spi_mem *spimem) struct spi_nor *nor = spi_mem_get_drvdata(spimem); spi_nor_restore(nor); @@ -88,18 +88,18 @@ index bee8fc4c9f07..ef2482a15b22 100644 /* Clean up MTD stuff. */ return mtd_device_unregister(&nor->mtd); diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h -index 42218a1164f6..d7598a38fc3f 100644 +index f92bf7f7a..193aceba8 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h -@@ -10,6 +10,7 @@ - #include +@@ -9,6 +9,7 @@ + #include #include #include +#include /* * Note on opcode nomenclature: some opcodes have a format like -@@ -404,6 +405,8 @@ struct spi_nor { +@@ -403,6 +404,8 @@ struct spi_nor { struct spi_mem_dirmap_desc *wdesc; } dirmap;