aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-05-09 09:41:30 +0100
committerRui Salvaterra <rsalvaterra@gmail.com>2022-05-09 20:49:50 +0100
commitd9a063c3967c72773616cf5eadd4f978b9724c50 (patch)
treee038cba587dad6c6de629c44278c7dcd62f7d3a3 /target/linux/ipq806x
parent634a45cf1d7e85d633314910bc030d40dbe476bb (diff)
downloadupstream-d9a063c3967c72773616cf5eadd4f978b9724c50.tar.gz
upstream-d9a063c3967c72773616cf5eadd4f978b9724c50.tar.bz2
upstream-d9a063c3967c72773616cf5eadd4f978b9724c50.zip
kernel: bump 5.15 to 5.15.38
Deleted (upstreamed): mediatek/patches-5.15/120-10-v5.18-mtd-nand-fix-ecc-parameters-for-mt7622.patch [1] Other patches automatically rebased. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.38&id=3ec920d755ae69c201b358e8d8e96c32f51145d8 Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/ipq806x')
-rw-r--r--target/linux/ipq806x/patches-5.15/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ipq806x/patches-5.15/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch b/target/linux/ipq806x/patches-5.15/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch
index ec1d0e5f4d..08c067255e 100644
--- a/target/linux/ipq806x/patches-5.15/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch
+++ b/target/linux/ipq806x/patches-5.15/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch
@@ -204,7 +204,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
host->use_ecc = true;
clear_bam_transaction(nandc);
-@@ -2899,6 +2958,7 @@ static int qcom_nand_host_init_and_regis
+@@ -2912,6 +2971,7 @@ static int qcom_nand_host_init_and_regis
struct nand_chip *chip = &host->chip;
struct mtd_info *mtd = nand_to_mtd(chip);
struct device *dev = nandc->dev;
@@ -212,7 +212,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
int ret;
ret = of_property_read_u32(dn, "reg", &host->cs);
-@@ -2960,6 +3020,17 @@ static int qcom_nand_host_init_and_regis
+@@ -2962,6 +3022,17 @@ static int qcom_nand_host_init_and_regis
if (ret)
nand_cleanup(chip);
@@ -230,7 +230,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
return ret;
}
-@@ -3125,6 +3196,7 @@ static int qcom_nandc_remove(struct plat
+@@ -3127,6 +3198,7 @@ static int qcom_nandc_remove(struct plat
static const struct qcom_nandc_props ipq806x_nandc_props = {
.ecc_modes = (ECC_RS_4BIT | ECC_BCH_8BIT),
.is_bam = false,