diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-11-25 20:06:39 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2019-07-04 08:29:13 +0200 |
| commit | f0c740650b466ffacae64a6f7b67ffacdaf28efd (patch) | |
| tree | 04acdaa9aadb6bda2811b4cf275c23f18d2b830e /target/linux/lantiq/patches-4.19/0018-MTD-nand-lots-of-xrx200-fixes.patch | |
| parent | eee1b34ce688efcb824ea9ce08edfce7ec507599 (diff) | |
| download | upstream-f0c740650b466ffacae64a6f7b67ffacdaf28efd.tar.gz upstream-f0c740650b466ffacae64a6f7b67ffacdaf28efd.tar.bz2 upstream-f0c740650b466ffacae64a6f7b67ffacdaf28efd.zip | |
lantiq: make patches apply
The following patches are dropped because they are now upstreamed:
- 0002-gpio-stp-xway-Implement-get-callback.patch
upstreamed with commit 5b9b2b5284f819 ("gpio: stp-xway: Implement get
callback")
- 0027-01-net-phy-intel-xway-add-VR9-version-number.patch
upstreamed with commit 5b73d9955fb4b0 ("net: phy: intel-xway: add VR9
version number")
- 0027-02-net-phy-intel-xway-add-VR9-v1.1-phy-ids.patch
upstreamed with commit f452518c982e57 ("net: phy: intel-xway: add VR9
v1.1 phy ids")
The following patches were updated:
- 0018-MTD-nand-lots-of-xrx200-fixes.patch
the mainline driver now resides in drivers/mtd/nand/raw/xway_nand.c
(instead of drivers/mtd/nand/xway_nand.c)
- 0025-NET-MIPS-lantiq-adds-xrx200-net.patch
the DMA API now requires a valid device to be passed to all operations
- 0028-NET-lantiq-various-etop-fixes.patch
the DMA API now requires a valid device to be passed to all operations
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/lantiq/patches-4.19/0018-MTD-nand-lots-of-xrx200-fixes.patch')
| -rw-r--r-- | target/linux/lantiq/patches-4.19/0018-MTD-nand-lots-of-xrx200-fixes.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-4.19/0018-MTD-nand-lots-of-xrx200-fixes.patch b/target/linux/lantiq/patches-4.19/0018-MTD-nand-lots-of-xrx200-fixes.patch index b97967d20e..4e34580efc 100644 --- a/target/linux/lantiq/patches-4.19/0018-MTD-nand-lots-of-xrx200-fixes.patch +++ b/target/linux/lantiq/patches-4.19/0018-MTD-nand-lots-of-xrx200-fixes.patch @@ -5,11 +5,11 @@ Subject: [PATCH 18/36] MTD: nand: lots of xrx200 fixes Signed-off-by: John Crispin <blogic@openwrt.org> --- - drivers/mtd/nand/xway_nand.c | 63 ++++++++++++++++++++++++++++++++++++++++++ + drivers/mtd/nand/raw/xway_nand.c | 63 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) ---- a/drivers/mtd/nand/xway_nand.c -+++ b/drivers/mtd/nand/xway_nand.c +--- a/drivers/mtd/nand/raw/xway_nand.c ++++ b/drivers/mtd/nand/raw/xway_nand.c @@ -63,6 +63,24 @@ #define NAND_CON_CSMUX (1 << 1) #define NAND_CON_NANDM 1 |