cns3xxx: remove the watchdog IRQ from the resources, it breaks the driver init and...

[librecmc/librecmc.git] / target / linux / cns3xxx / files / arch / arm / mach-cns3xxx / laguna.c

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 8b611c55826beea744224b8895755f814020a036..cd1aa716dc5c820125aa07ee271fd17316a89a00 100644 (file)
--- 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 = {
@@ -710,8 +705,6 @@ static struct gpio laguna_gpio_gw2380[] = {
  */
 static void __init laguna_init(void)
 {
-       cns3xxx_l2x0_init();
-
        platform_device_register(&laguna_watchdog);
 
        platform_device_register(&laguna_i2c_controller);
@@ -781,6 +774,9 @@ static int __init laguna_model_setup(void)
        u32 __iomem *mem;
        u32 reg;
 
+       if (!machine_is_gw2388())
+               return 0;
+
        printk("Running on Gateworks Laguna %s\n", laguna_info.model);
        cns3xxx_gpio_init( 0, 32, CNS3XXX_GPIOA_BASE_VIRT, IRQ_CNS3XXX_GPIOA,
                NR_IRQS_CNS3XXX);