aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2016-01-01 21:21:04 +0000
committerJohn Crispin <john@openwrt.org>2016-01-01 21:21:04 +0000
commite0019b33a4e198ab7b00b103d19d33988fdab4f6 (patch)
tree570a0697adc32bfb211ab711293f7552c6bc3f46 /package/kernel
parent8c80e915a0a610c429b88bc52313ebe5fae8a584 (diff)
downloadupstream-e0019b33a4e198ab7b00b103d19d33988fdab4f6.tar.gz
upstream-e0019b33a4e198ab7b00b103d19d33988fdab4f6.tar.bz2
upstream-e0019b33a4e198ab7b00b103d19d33988fdab4f6.zip
lantiq: ltq-vmmc: Fix compilation with linux 4.4
gpio.h needs the linux/ prefix with linux 4.4. SVN-Revision: 48057
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/lantiq/ltq-vmmc/patches/100-target.patch8
-rw-r--r--package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch2
2 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/lantiq/ltq-vmmc/patches/100-target.patch b/package/kernel/lantiq/ltq-vmmc/patches/100-target.patch
index cabd2d199c..974ed831de 100644
--- a/package/kernel/lantiq/ltq-vmmc/patches/100-target.patch
+++ b/package/kernel/lantiq/ltq-vmmc/patches/100-target.patch
@@ -143,7 +143,7 @@
-#include <asm/ifx/ifx_gptu.h>
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28))
+# include <lantiq.h>
-+# include <irq.h>
++# include <linux/irq.h>
+# include <lantiq_timer.h>
+
+# define ifx_gptu_timer_request lq_request_timer
@@ -432,7 +432,7 @@
-#include <asm/ifx/common_routines.h>
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28))
+# include <lantiq.h>
-+# include <irq.h>
++# include <linux/irq.h>
+# include <lantiq_timer.h>
+# include <linux/dma-mapping.h>
+
@@ -513,9 +513,9 @@
-#include <asm/ifx_vpe.h>
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28))
+# include <lantiq.h>
-+# include <irq.h>
++# include <linux/irq.h>
+# include <lantiq_soc.h>
-+# include <gpio.h>
++# include <linux/gpio.h>
+#define IFXMIPS_MPS_SRAM ((u32 *)(KSEG1 + 0x1F200000))
+#define IFXMIPS_MPS_BASE_ADDR (KSEG1 + 0x1F107000)
+#define IFXMIPS_MPS_CHIPID ((u32 *)(IFXMIPS_MPS_BASE_ADDR + 0x0344))
diff --git a/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch b/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch
index d2afc65dcd..7ebf171ad2 100644
--- a/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch
+++ b/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch
@@ -783,7 +783,7 @@
+++ b/src/mps/drv_mps_vmmc_device.h
@@ -22,7 +22,12 @@
# include <lantiq_soc.h>
- # include <gpio.h>
+ # include <linux/gpio.h>
#define IFXMIPS_MPS_SRAM ((u32 *)(KSEG1 + 0x1F200000))
+#if defined(SYSTEM_FALCON)
+#define IFXMIPS_MPS_BASE_ADDR (KSEG1 + 0x1D004000)