Merge tag 'stable/for-linus-3.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[deliverable/linux.git] / arch / arm / mach-cns3xxx / core.c

diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c
index e38b279f402c46977ed90323018044e431ede887..2ae28a69e3e55f69de95a0b498ac6acf7c58de70 100644 (file)
--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
@@ -47,6 +47,38 @@ static struct map_desc cns3xxx_io_desc[] __initdata = {
                .pfn            = __phys_to_pfn(CNS3XXX_PM_BASE),
                .length         = SZ_4K,
                .type           = MT_DEVICE,
+#ifdef CONFIG_PCI
+       }, {
+               .virtual        = CNS3XXX_PCIE0_HOST_BASE_VIRT,
+               .pfn            = __phys_to_pfn(CNS3XXX_PCIE0_HOST_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = CNS3XXX_PCIE0_CFG0_BASE_VIRT,
+               .pfn            = __phys_to_pfn(CNS3XXX_PCIE0_CFG0_BASE),
+               .length         = SZ_64K, /* really 4 KiB at offset 32 KiB */
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = CNS3XXX_PCIE0_CFG1_BASE_VIRT,
+               .pfn            = __phys_to_pfn(CNS3XXX_PCIE0_CFG1_BASE),
+               .length         = SZ_16M,
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = CNS3XXX_PCIE1_HOST_BASE_VIRT,
+               .pfn            = __phys_to_pfn(CNS3XXX_PCIE1_HOST_BASE),
+               .length         = SZ_4K,
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = CNS3XXX_PCIE1_CFG0_BASE_VIRT,
+               .pfn            = __phys_to_pfn(CNS3XXX_PCIE1_CFG0_BASE),
+               .length         = SZ_64K, /* really 4 KiB at offset 32 KiB */
+               .type           = MT_DEVICE,
+       }, {
+               .virtual        = CNS3XXX_PCIE1_CFG1_BASE_VIRT,
+               .pfn            = __phys_to_pfn(CNS3XXX_PCIE1_CFG1_BASE),
+               .length         = SZ_16M,
+               .type           = MT_DEVICE,
+#endif
        },
 };
 
@@ -155,7 +187,7 @@ static irqreturn_t cns3xxx_timer_interrupt(int irq, void *dev_id)
 
 static struct irqaction cns3xxx_timer_irq = {
        .name           = "timer",
-       .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+       .flags          = IRQF_TIMER | IRQF_IRQPOLL,
        .handler        = cns3xxx_timer_interrupt,
 };
 
@@ -368,7 +400,6 @@ static const char *cns3xxx_dt_compat[] __initdata = {
 
 DT_MACHINE_START(CNS3XXX_DT, "Cavium Networks CNS3xxx")
        .dt_compat      = cns3xxx_dt_compat,
-       .nr_irqs        = NR_IRQS_CNS3XXX,
        .map_io         = cns3xxx_map_io,
        .init_irq       = cns3xxx_init_irq,
        .init_time      = cns3xxx_timer_init,