4 files changed, 5 insertions, 10 deletions

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 70b5ccbac234..84c4bef2d726 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -264,7 +264,7 @@
                                                 atmel,pins =
                                                         <0 10 0x2 0x0   /* PA10 periph B */
                                                          0 11 0x2 0x0   /* PA11 periph B */
-                                                         0 24 0x2 0x0   /* PA24 periph B */
+                                                         0 22 0x2 0x0   /* PA22 periph B */
                                                          0 25 0x2 0x0   /* PA25 periph B */
                                                          0 26 0x2 0x0   /* PA26 periph B */
                                                          0 27 0x2 0x0   /* PA27 periph B */
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 3de8e6dfbcb1..8d25f889928e 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -57,6 +57,7 @@
                                 compatible = "atmel,at91rm9200-aic";
                                 interrupt-controller;
                                 reg = <0xfffff000 0x200>;
+                                atmel,external-irqs = <31>;
                         };
 
                         ramc0: ramc@ffffe800 {
diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c
index 13cdbcd48f51..c7d670d11802 100644
--- a/arch/arm/mach-at91/at91sam9n12.c
+++ b/arch/arm/mach-at91/at91sam9n12.c
@@ -223,13 +223,7 @@ static void __init at91sam9n12_map_io(void)
         at91_init_sram(0, AT91SAM9N12_SRAM_BASE, AT91SAM9N12_SRAM_SIZE);
 }
 
-void __init at91sam9n12_initialize(void)
-{
-        at91_extern_irq = (1 << AT91SAM9N12_ID_IRQ0);
-}
-
 AT91_SOC_START(at91sam9n12)
         .map_io = at91sam9n12_map_io,
         .register_clocks = at91sam9n12_register_clocks,
-        .init = at91sam9n12_initialize,
 AT91_SOC_END
diff --git a/arch/arm/mach-at91/include/mach/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h
index 31df12029c4e..2bd7f51b0b82 100644
--- a/arch/arm/mach-at91/include/mach/at91_pmc.h
+++ b/arch/arm/mach-at91/include/mach/at91_pmc.h
@@ -179,9 +179,9 @@ extern void __iomem *at91_pmc_base;
 #define         AT91_PMC_PCR_CMD        (0x1  <<  12)           /* Command (read=0, write=1) */
 #define         AT91_PMC_PCR_DIV(n)     ((n)  <<  16)           /* Divisor Value */
 #define                 AT91_PMC_PCR_DIV0       0x0                     /* Peripheral clock is MCK */
-#define                 AT91_PMC_PCR_DIV2       0x2                     /* Peripheral clock is MCK/2 */
-#define                 AT91_PMC_PCR_DIV4       0x4                     /* Peripheral clock is MCK/4 */
-#define                 AT91_PMC_PCR_DIV8       0x8                     /* Peripheral clock is MCK/8 */
+#define                 AT91_PMC_PCR_DIV2       0x1                     /* Peripheral clock is MCK/2 */
+#define                 AT91_PMC_PCR_DIV4       0x2                     /* Peripheral clock is MCK/4 */
+#define                 AT91_PMC_PCR_DIV8       0x3                     /* Peripheral clock is MCK/8 */
 #define         AT91_PMC_PCR_EN         (0x1  <<  28)           /* Enable */
 
 #endif