diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-04-07 11:24:30 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-07 11:24:30 +0000 |
commit | d9d6fd3f5d1226fa3350cfbc0be6f106b2cecc67 (patch) | |
tree | 0554df5001b19e269e118996b9f2d3c74c086eae /target/linux/cns3xxx | |
parent | 59f2fed12c1747c2a243a0afa865d288bd42b93b (diff) | |
download | upstream-d9d6fd3f5d1226fa3350cfbc0be6f106b2cecc67.tar.gz upstream-d9d6fd3f5d1226fa3350cfbc0be6f106b2cecc67.tar.bz2 upstream-d9d6fd3f5d1226fa3350cfbc0be6f106b2cecc67.zip |
cns3xxx: remove the watchdog IRQ from the resources, it breaks the driver init and is useful only for testing
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36241 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx')
-rw-r--r-- | target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c | 5 | ||||
-rw-r--r-- | target/linux/cns3xxx/patches-3.8/025-smp_support.patch | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c index 84a440bf18..cd1aa716dc 100644 --- a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c +++ b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c @@ -567,11 +567,6 @@ static struct resource laguna_watchdog_resources[] = { .end = CNS3XXX_TC11MP_TWD_BASE + SZ_4K - 1, .flags = IORESOURCE_MEM, }, - [1] = { - .start = IRQ_LOCALWDOG, - .end = IRQ_LOCALWDOG, - .flags = IORESOURCE_IRQ, - } }; static struct platform_device laguna_watchdog = { diff --git a/target/linux/cns3xxx/patches-3.8/025-smp_support.patch b/target/linux/cns3xxx/patches-3.8/025-smp_support.patch index a9856451bf..e777938e57 100644 --- a/target/linux/cns3xxx/patches-3.8/025-smp_support.patch +++ b/target/linux/cns3xxx/patches-3.8/025-smp_support.patch @@ -28,7 +28,7 @@ #ifdef CONFIG_CACHE_L2X0 --- a/arch/arm/mach-cns3xxx/laguna.c +++ b/arch/arm/mach-cns3xxx/laguna.c -@@ -946,6 +946,7 @@ static int __init laguna_model_setup(voi +@@ -941,6 +941,7 @@ static int __init laguna_model_setup(voi late_initcall(laguna_model_setup); MACHINE_START(GW2388, "Gateworks Corporation Laguna Platform") |