ar71xx: fix sysupgrade on PB42/PB44 boards

[openwrt.git] / package / ltq-dsl / src / lantiq_mei.c

diff --git a/package/ltq-dsl/src/lantiq_mei.c b/package/ltq-dsl/src/lantiq_mei.c
index ac81892..aadb098 100644 (file)
--- a/package/ltq-dsl/src/lantiq_mei.c
+++ b/package/ltq-dsl/src/lantiq_mei.c
@@ -1351,11 +1351,13 @@ IFX_MEI_RunAdslModem (DSL_DEV_Device_t *pDev)
        im2_register = (*LTQ_ICU_IM2_IER) & (1 << 20);
        /* Turn off irq */
        #ifdef CONFIG_SOC_AMAZON_SE
        im2_register = (*LTQ_ICU_IM2_IER) & (1 << 20);
        /* Turn off irq */
        #ifdef CONFIG_SOC_AMAZON_SE

+#define        IFXMIPS_USB_OC_INT0 (INT_NUM_IM4_IRL0 + 23)

        disable_irq (IFXMIPS_USB_OC_INT0);
        disable_irq (IFXMIPS_USB_OC_INT0);

-       disable_irq (IFXMIPS_USB_OC_INT2);
-       #elif defined(CONFIG_LANTIQ_AR9)
+//     disable_irq (IFXMIPS_USB_OC_INT2);
+       #elif defined(CONFIG_SOC_AR9)
+#define        IFXMIPS_USB_OC_INT0 (INT_NUM_IM4_IRL1 + 28)

        disable_irq (IFXMIPS_USB_OC_INT0);
        disable_irq (IFXMIPS_USB_OC_INT0);

-       disable_irq (IFXMIPS_USB_OC_INT2);
+//     disable_irq (IFXMIPS_USB_OC_INT2);

        #elif defined(CONFIG_SOC_XWAY)
        disable_irq (LTQ_USB_OC_INT);
        #else
        #elif defined(CONFIG_SOC_XWAY)
        disable_irq (LTQ_USB_OC_INT);
        #else


@@ -1369,10 +1371,10 @@ IFX_MEI_RunAdslModem (DSL_DEV_Device_t *pDev)
 
        #ifdef CONFIG_SOC_AMAZON_SE
        MEI_MASK_AND_ACK_IRQ (IFXMIPS_USB_OC_INT0);
 
        #ifdef CONFIG_SOC_AMAZON_SE
        MEI_MASK_AND_ACK_IRQ (IFXMIPS_USB_OC_INT0);

-       MEI_MASK_AND_ACK_IRQ (IFXMIPS_USB_OC_INT2);
-       #elif defined(CONFIG_LANTIQ_AMAZON_S)
+//     MEI_MASK_AND_ACK_IRQ (IFXMIPS_USB_OC_INT2);
+       #elif defined(CONFIG_SOC_AR9)

        MEI_MASK_AND_ACK_IRQ (IFXMIPS_USB_OC_INT0);
        MEI_MASK_AND_ACK_IRQ (IFXMIPS_USB_OC_INT0);

-       MEI_MASK_AND_ACK_IRQ (IFXMIPS_USB_OC_INT2);
+//     MEI_MASK_AND_ACK_IRQ (IFXMIPS_USB_OC_INT2);

        #elif defined(CONFIG_SOC_XWAY)
        MEI_MASK_AND_ACK_IRQ (LTQ_USB_OC_INT);
        #else
        #elif defined(CONFIG_SOC_XWAY)
        MEI_MASK_AND_ACK_IRQ (LTQ_USB_OC_INT);
        #else