kernel: refresh patches

[openwrt/staging/noltari.git] / target / linux / generic / pending-5.15 / 487-mtd-spinand-Add-support-for-Etron-EM73D044VCx.patch

diff --git a/target/linux/generic/pending-5.15/487-mtd-spinand-Add-support-for-Etron-EM73D044VCx.patch b/target/linux/generic/pending-5.15/487-mtd-spinand-Add-support-for-Etron-EM73D044VCx.patch
index a48e02fc083bca74acbed67f10b4308293368106..c32e15d0c642d7bfd8d9ab0bf7d9ebeb8f13d679 100644 (file)
--- a/target/linux/generic/pending-5.15/487-mtd-spinand-Add-support-for-Etron-EM73D044VCx.patch
+++ b/target/linux/generic/pending-5.15/487-mtd-spinand-Add-support-for-Etron-EM73D044VCx.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/mtd/nand/spi/Makefile b/drivers/mtd/nand/spi/Makefile
-index 9c64d9fc..5f99ea72 100644
 --- a/drivers/mtd/nand/spi/Makefile
 +++ b/drivers/mtd/nand/spi/Makefile
 @@ -1,3 +1,3 @@
@@ -7,21 +5,16 @@ index 9c64d9fc..5f99ea72 100644
 -spinand-objs := core.o esmt.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o xtx.o
 +spinand-objs := core.o esmt.o etron.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o xtx.o
  obj-$(CONFIG_MTD_SPI_NAND) += spinand.o
-diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
-index 9839ee44..9ab44217 100644
 --- a/drivers/mtd/nand/spi/core.c
 +++ b/drivers/mtd/nand/spi/core.c
-@@ -898,6 +898,7 @@ static const struct nand_ops spinand_ops = {
+@@ -898,6 +898,7 @@ static const struct nand_ops spinand_ops
  static const struct spinand_manufacturer *spinand_manufacturers[] = {
-       &esmt_c8_spinand_manufacturer,
-       &gigadevice_spinand_manufacturer,
+       &esmt_c8_spinand_manufacturer,
+       &gigadevice_spinand_manufacturer,
 +      &etron_spinand_manufacturer,
-       &macronix_spinand_manufacturer,
-       &micron_spinand_manufacturer,
-       &paragon_spinand_manufacturer,
-diff --git a/drivers/mtd/nand/spi/etron.c b/drivers/mtd/nand/spi/etron.c
-new file mode 100644
-index 00000000..653092be
+       &macronix_spinand_manufacturer,
+       &micron_spinand_manufacturer,
+       &paragon_spinand_manufacturer,
 --- /dev/null
 +++ b/drivers/mtd/nand/spi/etron.c
 @@ -0,0 +1,98 @@
@@ -123,12 +116,10 @@ index 00000000..653092be
 +      .nchips = ARRAY_SIZE(etron_spinand_table),
 +      .ops = &etron_spinand_manuf_ops,
 +};
-diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h
-index 2066962d..11d38d2f 100644
 --- a/include/linux/mtd/spinand.h
 +++ b/include/linux/mtd/spinand.h
 @@ -261,6 +261,7 @@ struct spinand_manufacturer {
-
+ 
  /* SPI NAND manufacturers */
  extern const struct spinand_manufacturer esmt_c8_spinand_manufacturer;
 +extern const struct spinand_manufacturer etron_spinand_manufacturer;