OpenWrt – Rev 1

Subversion Repositories:
Rev:
--- a/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
@@ -223,6 +223,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;
 }
--- a/arch/arm/mach-cns3xxx/Kconfig
+++ b/arch/arm/mach-cns3xxx/Kconfig
@@ -3,6 +3,8 @@ menuconfig ARCH_CNS3XXX
        bool "Cavium Networks CNS3XXX family"
        depends on ARCH_MULTI_V6
        select ARM_GIC
+       select ARCH_REQUIRE_GPIOLIB
+       select GENERIC_IRQ_CHIP
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD
        select HAVE_SMP
--- a/arch/arm/mach-cns3xxx/Makefile
+++ b/arch/arm/mach-cns3xxx/Makefile
@@ -2,7 +2,7 @@
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
 
 obj-$(CONFIG_ARCH_CNS3XXX)             += cns3xxx.o
-cns3xxx-y                              += core.o pm.o
+cns3xxx-y                              += core.o pm.o gpio.o
 cns3xxx-$(CONFIG_ATAGS)                        += devices.o
 cns3xxx-$(CONFIG_PCI)                  += pcie.o
 cns3xxx-$(CONFIG_MACH_CNS3420VB)       += cns3420vb.o
--- a/arch/arm/mach-cns3xxx/cns3xxx.h
+++ b/arch/arm/mach-cns3xxx/cns3xxx.h
@@ -68,8 +68,10 @@
 #define SMC_PCELL_ID_3_OFFSET                  0xFFC
 
 #define CNS3XXX_GPIOA_BASE                     0x74000000      /* GPIO port A */
+#define CNS3XXX_GPIOA_BASE_VIRT                        0xFB006000
 
 #define CNS3XXX_GPIOB_BASE                     0x74800000      /* GPIO port B */
+#define CNS3XXX_GPIOB_BASE_VIRT                        0xFB007000
 
 #define CNS3XXX_RTC_BASE                       0x75000000      /* Real Time Clock */
 
--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
@@ -50,6 +50,16 @@ static struct map_desc cns3xxx_io_desc[]
                .pfn            = __phys_to_pfn(CNS3XXX_PM_BASE),
                .length         = SZ_4K,
                .type           = MT_DEVICE,
+       }, {
+               .virtual        = CNS3XXX_GPIOA_BASE_VIRT,
+               .pfn            = __phys_to_pfn(CNS3XXX_GPIOA_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = CNS3XXX_GPIOB_BASE_VIRT,
+               .pfn            = __phys_to_pfn(CNS3XXX_GPIOB_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
 #ifdef CONFIG_PCI
        }, {
                .virtual        = CNS3XXX_PCIE0_HOST_BASE_VIRT,