[ARM PATCH] 2002/1: lh7a40x Timer fixup

Patch from Marc Singer

The work already done to rectify the timer code initialization missed
a necessary change.  This patch adds a timer initialization function
to the LPD7A400 machine type.  It also makes a small correction to the
kernel configuration that is out of step with the machine specific
Kconfig.

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index db5ad1f64c6d731c42d0e02ae7193606edc52577..43adecf6ac3432e2caf241559f0670e41e31312d 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -253,7 +253,7 @@ menu "General setup"
 # Select various configuration options depending on the machine type
 config DISCONTIGMEM
        bool
-       depends on ARCH_EDB7211 || ARCH_SA1100 || (ARCH_LH7A40X && !LH7A40X_SROMLL)
+       depends on ARCH_EDB7211 || ARCH_SA1100 || (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
        default y
        help
          Say Y to support efficient handling of discontiguous physical memory,

diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
index 33eb4b8dd358831510062d0db22de7e5ccf512a7..9e0bf6c18234812f1d2db7c787239197346f5cbb 100644 (file)
--- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
@@ -265,6 +265,7 @@ lpd7a400_map_io(void)
 #ifdef CONFIG_MACH_LPD7A400
 
 extern void lh7a400_init_irq (void);
+extern void lh7a40x_init_time (void);
 
 MACHINE_START (LPD7A400, "Logic Product Development LPD7A400-10")
        MAINTAINER ("Marc Singer")
@@ -272,6 +273,7 @@ MACHINE_START (LPD7A400, "Logic Product Development LPD7A400-10")
        BOOT_PARAMS (0xc0000100)
        MAPIO (lpd7a400_map_io)
        INITIRQ (lh7a400_init_irq)
+       INITTIME (lh7a40x_init_time)
        INIT_MACHINE (lpd7a40x_init)
 MACHINE_END