2012-05-18 20:10:53 +00:00
|
|
|
--- a/arch/arm/mach-cns3xxx/cns3420vb.c
|
|
|
|
|
+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
|
2012-11-12 19:27:30 +00:00
|
|
|
@@ -198,6 +198,10 @@ static void __init cns3420_init(void)
|
|
|
|
|
|
|
|
|
|
cns3xxx_ahci_init();
|
|
|
|
|
cns3xxx_sdhci_init();
|
|
|
|
|
+ cns3xxx_gpio_init( 0, 32, CNS3XXX_GPIOA_BASE_VIRT, IRQ_CNS3XXX_GPIOA,
|
|
|
|
|
+ NR_IRQS_CNS3XXX);
|
|
|
|
|
+ cns3xxx_gpio_init(32, 32, CNS3XXX_GPIOB_BASE_VIRT, IRQ_CNS3XXX_GPIOB,
|
|
|
|
|
+ NR_IRQS_CNS3XXX + 32);
|
|
|
|
|
|
|
|
|
|
pm_power_off = cns3xxx_power_off;
|
|
|
|
|
}
|
|
|
|
|
@@ -213,7 +217,7 @@ static struct map_desc cns3420_io_desc[]
|
2012-05-18 20:10:53 +00:00
|
|
|
|
|
|
|
|
static void __init cns3420_map_io(void)
|
|
|
|
|
{
|
|
|
|
|
- cns3xxx_map_io();
|
|
|
|
|
+ cns3xxx_common_init();
|
2012-11-12 09:18:00 +00:00
|
|
|
cns3xxx_pcie_iotable_init();
|
2012-05-18 20:10:53 +00:00
|
|
|
iotable_init(cns3420_io_desc, ARRAY_SIZE(cns3420_io_desc));
|
|
|
|
|
|
|
|
|
|
--- a/arch/arm/mach-cns3xxx/core.c
|
|
|
|
|
+++ b/arch/arm/mach-cns3xxx/core.c
|
2012-11-12 19:27:30 +00:00
|
|
|
@@ -82,7 +82,7 @@ static struct map_desc cns3xxx_io_desc[]
|
2012-05-18 20:10:53 +00:00
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
-void __init cns3xxx_map_io(void)
|
|
|
|
|
+void __init cns3xxx_common_init(void)
|
|
|
|
|
{
|
|
|
|
|
#ifdef CONFIG_LOCAL_TIMERS
|
|
|
|
|
twd_base = (void __iomem *) CNS3XXX_TC11MP_TWD_BASE_VIRT;
|
|
|
|
|
--- a/arch/arm/mach-cns3xxx/core.h
|
|
|
|
|
+++ b/arch/arm/mach-cns3xxx/core.h
|
2012-11-12 09:18:00 +00:00
|
|
|
@@ -21,7 +21,7 @@ void __init cns3xxx_l2x0_init(void);
|
2012-05-18 20:10:53 +00:00
|
|
|
static inline void cns3xxx_l2x0_init(void) {}
|
|
|
|
|
#endif /* CONFIG_CACHE_L2X0 */
|
|
|
|
|
|
|
|
|
|
-void __init cns3xxx_map_io(void);
|
|
|
|
|
+void __init cns3xxx_common_init(void);
|
|
|
|
|
void __init cns3xxx_init_irq(void);
|
2012-11-12 09:18:00 +00:00
|
|
|
int __init cns3xxx_pcie_init(void);
|
2012-05-18 20:10:53 +00:00
|
|
|
void cns3xxx_power_off(void);
|
2012-09-21 05:40:04 +00:00
|
|
|
--- a/arch/arm/Kconfig
|
|
|
|
|
+++ b/arch/arm/Kconfig
|
2012-11-12 19:27:30 +00:00
|
|
|
@@ -366,6 +366,8 @@ config ARCH_CLPS711X
|
2012-09-21 05:40:04 +00:00
|
|
|
config ARCH_CNS3XXX
|
|
|
|
|
bool "Cavium Networks CNS3XXX family"
|
|
|
|
|
select CPU_V6K
|
2012-11-12 19:27:30 +00:00
|
|
|
+ select ARCH_REQUIRE_GPIOLIB
|
|
|
|
|
+ select GENERIC_IRQ_CHIP
|
2012-09-21 05:40:04 +00:00
|
|
|
select GENERIC_CLOCKEVENTS
|
|
|
|
|
select ARM_GIC
|
|
|
|
|
select CLKDEV_LOOKUP
|
2012-11-12 19:27:30 +00:00
|
|
|
--- a/arch/arm/mach-cns3xxx/Makefile
|
|
|
|
|
+++ b/arch/arm/mach-cns3xxx/Makefile
|
|
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
|
-obj-$(CONFIG_ARCH_CNS3XXX) += core.o pm.o devices.o
|
|
|
|
|
+obj-$(CONFIG_ARCH_CNS3XXX) += core.o gpio.o pm.o devices.o
|
|
|
|
|
obj-$(CONFIG_PCI) += pcie.o
|
|
|
|
|
obj-$(CONFIG_MACH_CNS3420VB) += cns3420vb.o
|
|
|
|
|
obj-$(CONFIG_SMP) += platsmp.o headsmp.o cns3xxx_fiq.o
|
|
|
|
|
--- a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
|
|
|
|
|
+++ b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
|
|
|
|
|
@@ -627,7 +627,7 @@ int cns3xxx_cpu_clock(void);
|
|
|
|
|
|
|
|
|
|
#if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_CNS3XXX)
|
|
|
|
|
#undef NR_IRQS
|
|
|
|
|
-#define NR_IRQS NR_IRQS_CNS3XXX
|
|
|
|
|
+#define NR_IRQS (NR_IRQS_CNS3XXX + 64)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#endif /* __MACH_BOARD_CNS3XXX_H */
|
