aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-4.19/0152-lantiq-VPE.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-11-25 20:06:39 +0100
committerMathias Kresin <dev@kresin.me>2019-07-04 08:29:13 +0200
commitf0c740650b466ffacae64a6f7b67ffacdaf28efd (patch)
tree04acdaa9aadb6bda2811b4cf275c23f18d2b830e /target/linux/lantiq/patches-4.19/0152-lantiq-VPE.patch
parenteee1b34ce688efcb824ea9ce08edfce7ec507599 (diff)
downloadupstream-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/0152-lantiq-VPE.patch')
-rw-r--r--target/linux/lantiq/patches-4.19/0152-lantiq-VPE.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/lantiq/patches-4.19/0152-lantiq-VPE.patch b/target/linux/lantiq/patches-4.19/0152-lantiq-VPE.patch
index b0b5bd3a57..d40dcef509 100644
--- a/target/linux/lantiq/patches-4.19/0152-lantiq-VPE.patch
+++ b/target/linux/lantiq/patches-4.19/0152-lantiq-VPE.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -2327,6 +2327,12 @@ config MIPS_VPE_LOADER
+@@ -2317,6 +2317,12 @@ config MIPS_VPE_LOADER
Includes a loader for loading an elf relocatable object
onto another VPE and running it.
@@ -142,7 +142,7 @@
{
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c
-@@ -37,10 +37,14 @@ unsigned long physical_memsize = 0L;
+@@ -36,10 +36,14 @@ unsigned long physical_memsize = 0L;
*/
static struct ltq_soc_info soc_info;