1 --- a/arch/arm/mach-cns3xxx/cns3420vb.c
2 +++ b/arch/arm/mach-cns3xxx/cns3420vb.c
3 @@ -247,6 +247,10 @@ static void __init cns3420_init(void)
7 + cns3xxx_gpio_init( 0, 32, CNS3XXX_GPIOA_BASE_VIRT, IRQ_CNS3XXX_GPIOA,
9 + cns3xxx_gpio_init(32, 32, CNS3XXX_GPIOB_BASE_VIRT, IRQ_CNS3XXX_GPIOB,
10 + NR_IRQS_CNS3XXX + 32);
12 pm_power_off = cns3xxx_power_off;
14 @@ -262,7 +266,7 @@ static struct map_desc cns3420_io_desc[]
16 static void __init cns3420_map_io(void)
19 + cns3xxx_common_init();
20 cns3xxx_pcie_iotable_init();
21 iotable_init(cns3420_io_desc, ARRAY_SIZE(cns3420_io_desc));
23 --- a/arch/arm/mach-cns3xxx/core.c
24 +++ b/arch/arm/mach-cns3xxx/core.c
25 @@ -82,7 +82,7 @@ static struct map_desc cns3xxx_io_desc[]
29 -void __init cns3xxx_map_io(void)
30 +void __init cns3xxx_common_init(void)
32 iotable_init(cns3xxx_io_desc, ARRAY_SIZE(cns3xxx_io_desc));
34 --- a/arch/arm/mach-cns3xxx/core.h
35 +++ b/arch/arm/mach-cns3xxx/core.h
36 @@ -22,7 +22,7 @@ void __init cns3xxx_l2x0_init(void);
37 static inline void cns3xxx_l2x0_init(void) {}
38 #endif /* CONFIG_CACHE_L2X0 */
40 -void __init cns3xxx_map_io(void);
41 +void __init cns3xxx_common_init(void);
42 void __init cns3xxx_init_irq(void);
43 int __init cns3xxx_pcie_init(void);
44 void cns3xxx_power_off(void);
45 --- a/arch/arm/Kconfig
46 +++ b/arch/arm/Kconfig
47 @@ -361,6 +361,8 @@ config ARCH_CNS3XXX
48 bool "Cavium Networks CNS3XXX family"
51 + select ARCH_REQUIRE_GPIOLIB
52 + select GENERIC_IRQ_CHIP
53 select GENERIC_CLOCKEVENTS
54 select MIGHT_HAVE_CACHE_L2X0
56 --- a/arch/arm/mach-cns3xxx/Makefile
57 +++ b/arch/arm/mach-cns3xxx/Makefile
59 -obj-$(CONFIG_ARCH_CNS3XXX) += core.o pm.o devices.o
60 +obj-$(CONFIG_ARCH_CNS3XXX) += core.o gpio.o pm.o devices.o
61 obj-$(CONFIG_PCI) += pcie.o
62 obj-$(CONFIG_MACH_CNS3420VB) += cns3420vb.o
63 obj-$(CONFIG_SMP) += platsmp.o headsmp.o cns3xxx_fiq.o
64 --- a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
65 +++ b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
66 @@ -627,7 +627,7 @@ int cns3xxx_cpu_clock(void);
68 #if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_CNS3XXX)
70 -#define NR_IRQS NR_IRQS_CNS3XXX
71 +#define NR_IRQS (NR_IRQS_CNS3XXX + 64)
74 #endif /* __MACH_BOARD_CNS3XXX_H */