diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2022-09-07 03:54:34 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-09-07 04:21:41 +0100 |
| commit | 884e63fa68f717a3feb14c930cc0269f0450ef5a (patch) | |
| tree | 6220abdb6ed9a8384a765b814d1b5fbe695c6611 /target/linux/generic/pending-5.15 | |
| parent | 33c11442b2fc60313a2d3196c9b01cf9b0931305 (diff) | |
| download | upstream-884e63fa68f717a3feb14c930cc0269f0450ef5a.tar.gz upstream-884e63fa68f717a3feb14c930cc0269f0450ef5a.tar.bz2 upstream-884e63fa68f717a3feb14c930cc0269f0450ef5a.zip | |
kernel: refresh patches
The introduction of the new Airoha target has left the tree in an
unfresh state. Refresh patches to improve that situation.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/generic/pending-5.15')
| -rw-r--r-- | target/linux/generic/pending-5.15/487-mtd-spinand-Add-support-for-Etron-EM73D044VCx.patch | 23 | ||||
| -rw-r--r-- | target/linux/generic/pending-5.15/773-net-sfp-add-support-for-HALNy-GPON-SFP.patch | 2 |
2 files changed, 8 insertions, 17 deletions
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 a48e02fc08..c32e15d0c6 100644 --- 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, - ¯onix_spinand_manufacturer, - µn_spinand_manufacturer, - ¶gon_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 + ¯onix_spinand_manufacturer, + µn_spinand_manufacturer, + ¶gon_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; diff --git a/target/linux/generic/pending-5.15/773-net-sfp-add-support-for-HALNy-GPON-SFP.patch b/target/linux/generic/pending-5.15/773-net-sfp-add-support-for-HALNy-GPON-SFP.patch index 9ec4781273..85c1d5b203 100644 --- a/target/linux/generic/pending-5.15/773-net-sfp-add-support-for-HALNy-GPON-SFP.patch +++ b/target/linux/generic/pending-5.15/773-net-sfp-add-support-for-HALNy-GPON-SFP.patch @@ -24,7 +24,7 @@ Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> + if (bus->sfp_quirk && bus->sfp_quirk->modes) bus->sfp_quirk->modes(id, modes); - bitmap_or(support, support, modes, __ETHTOOL_LINK_MODE_MASK_NBITS); + linkmode_or(support, support, modes); --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -320,6 +320,23 @@ static void sfp_fixup_ignore_tx_fault(st |