The patch adds initialization of FIQ related handlers to the Amstrad Delta videophone board code. FIQ will be used instead of a traditional IRQ for processing all GPIO generated interrupts, including a keyboard serial clock line.
Amstrad Delta defconfig is modified to use FIQ by default.
Compiles and works on top of patch 2/5 from this series: omap1: Amstrad Delta: add a handler for processing interrupts generated by the FIQ routine
Created and tested against linux-2.6.34-rc2.
Signed-off-by: Janusz Krzysztofik jkrzyszt@tis.icnet.pl --- v2 changes: - no functional changes, - refreshed against linux-2.6.34-rc2.
arch/arm/configs/ams_delta_defconfig | 1 + arch/arm/mach-omap1/board-ams-delta.c | 6 ++++++ 2 files changed, 7 insertions(+)
diff -uprN git.orig/arch/arm/configs/ams_delta_defconfig git/arch/arm/configs/ams_delta_defconfig --- git.orig/arch/arm/configs/ams_delta_defconfig 2010-03-25 15:51:51.000000000 +0100 +++ git/arch/arm/configs/ams_delta_defconfig 2010-03-28 23:38:54.000000000 +0200 @@ -195,6 +195,7 @@ CONFIG_ARCH_OMAP15XX=y # CONFIG_MACH_OMAP_PALMTT is not set # CONFIG_MACH_SX1 is not set CONFIG_MACH_AMS_DELTA=y +CONFIG_AMS_DELTA_FIQ=y # CONFIG_MACH_OMAP_GENERIC is not set
# diff -uprN git.orig/arch/arm/mach-omap1/board-ams-delta.c git/arch/arm/mach-omap1/board-ams-delta.c --- git.orig/arch/arm/mach-omap1/board-ams-delta.c 2010-03-25 15:52:17.000000000 +0100 +++ git/arch/arm/mach-omap1/board-ams-delta.c 2010-03-28 23:38:54.000000000 +0200 @@ -33,6 +33,8 @@ #include <plat/board.h> #include <plat/common.h>
+#include <mach/ams-delta-fiq.h> + static u8 ams_delta_latch1_reg; static u16 ams_delta_latch2_reg;
@@ -236,6 +238,10 @@ static void __init ams_delta_init(void) omap_usb_init(&ams_delta_usb_config); platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));
+#ifdef CONFIG_AMS_DELTA_FIQ + ams_delta_init_fiq(); +#endif + omap_writew(omap_readw(ARM_RSTCT1) | 0x0004, ARM_RSTCT1); }