aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-09-19 23:49:50 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-09-19 23:49:50 +0000
commita60c9bb9c03f630c7850e0f108906e7d8396feb0 (patch)
tree0ebdfd5aa768986a0dbeab80a0b5bd8dd334632d /target/linux/cns3xxx
parent1d1dcc83944180253ffa8d8322001c0b6e2acf76 (diff)
downloadupstream-a60c9bb9c03f630c7850e0f108906e7d8396feb0.tar.gz
upstream-a60c9bb9c03f630c7850e0f108906e7d8396feb0.tar.bz2
upstream-a60c9bb9c03f630c7850e0f108906e7d8396feb0.zip
cns3xxx: add missing callbacks for the laguna machine support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33484 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx')
-rw-r--r--target/linux/cns3xxx/patches-3.3/100-laguna_support.patch5
-rw-r--r--target/linux/cns3xxx/patches-3.3/102-cns3xxx_timers.patch2
-rw-r--r--target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch2
-rw-r--r--target/linux/cns3xxx/patches-3.3/200-dwc_otg.patch2
4 files changed, 7 insertions, 4 deletions
diff --git a/target/linux/cns3xxx/patches-3.3/100-laguna_support.patch b/target/linux/cns3xxx/patches-3.3/100-laguna_support.patch
index 64b7adb7e0..45162bd9f7 100644
--- a/target/linux/cns3xxx/patches-3.3/100-laguna_support.patch
+++ b/target/linux/cns3xxx/patches-3.3/100-laguna_support.patch
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/arch/arm/mach-cns3xxx/laguna.c
-@@ -0,0 +1,761 @@
+@@ -0,0 +1,764 @@
+/*
+ * Gateworks Corporation Laguna Platform
+ *
@@ -45,6 +45,7 @@
+#include <mach/irqs.h>
+#include <mach/platform.h>
+#include <mach/pm.h>
++#include <asm/hardware/gic.h>
+#include "core.h"
+#include "devices.h"
+
@@ -760,7 +761,9 @@
+ .map_io = laguna_map_io,
+ .init_irq = cns3xxx_init_irq,
+ .timer = &cns3xxx_timer,
++ .handle_irq = gic_handle_irq,
+ .init_machine = laguna_init,
++ .restart = cns3xxx_restart,
+MACHINE_END
--- a/arch/arm/mach-cns3xxx/Kconfig
+++ b/arch/arm/mach-cns3xxx/Kconfig
diff --git a/target/linux/cns3xxx/patches-3.3/102-cns3xxx_timers.patch b/target/linux/cns3xxx/patches-3.3/102-cns3xxx_timers.patch
index 9adf007b27..281f61f414 100644
--- a/target/linux/cns3xxx/patches-3.3/102-cns3xxx_timers.patch
+++ b/target/linux/cns3xxx/patches-3.3/102-cns3xxx_timers.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
-@@ -125,12 +125,13 @@ static void cns3xxx_timer_set_mode(enum
+@@ -125,12 +125,13 @@ static void cns3xxx_timer_set_mode(enum
switch (mode) {
case CLOCK_EVT_MODE_PERIODIC:
diff --git a/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch b/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
index c5928e5e33..e8a1d4be85 100644
--- a/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
+++ b/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
@@ -107,7 +107,7 @@
void cns3xxx_restart(char, const char *);
--- a/arch/arm/mach-cns3xxx/laguna.c
+++ b/arch/arm/mach-cns3xxx/laguna.c
-@@ -611,7 +611,7 @@ static struct map_desc laguna_io_desc[]
+@@ -612,7 +612,7 @@ static struct map_desc laguna_io_desc[]
static void __init laguna_map_io(void)
{
diff --git a/target/linux/cns3xxx/patches-3.3/200-dwc_otg.patch b/target/linux/cns3xxx/patches-3.3/200-dwc_otg.patch
index b53e508df3..8439d0ec70 100644
--- a/target/linux/cns3xxx/patches-3.3/200-dwc_otg.patch
+++ b/target/linux/cns3xxx/patches-3.3/200-dwc_otg.patch
@@ -1,6 +1,6 @@
--- a/drivers/Makefile
+++ b/drivers/Makefile
-@@ -70,6 +70,7 @@ obj-$(CONFIG_PARIDE) += block/paride/
+@@ -71,6 +71,7 @@ obj-$(CONFIG_PARIDE) += block/paride/
obj-$(CONFIG_TC) += tc/
obj-$(CONFIG_UWB) += uwb/
obj-$(CONFIG_USB_OTG_UTILS) += usb/