Merge branch 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux into late/soc

A few device tree updates and an include file fix for versatile.

* 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux:
  ARM: vexpress: Remove twice included header files
  ARM: vexpress: Device Tree updates
  + update to 3.4

Signed-off-by: Olof Johansson <olof@lixom.net>

9 files changed, 47 insertions, 31 deletions

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
index 941b161ab78c..7e1091d91af8 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
@@ -73,7 +73,10 @@
                 #address-cells = <0>;
                 interrupt-controller;
                 reg = <0x2c001000 0x1000>,
-                      <0x2c002000 0x100>;
+                      <0x2c002000 0x1000>,
+                      <0x2c004000 0x2000>,
+                      <0x2c006000 0x2000>;
+                interrupts = <1 9 0xf04>;
         };
 
         memory-controller@7ffd0000 {
@@ -93,6 +96,14 @@
                              <0 91 4>;
         };
 
+        timer {
+                compatible = "arm,armv7-timer";
+                interrupts = <1 13 0xf08>,
+                             <1 14 0xf08>,
+                             <1 11 0xf08>,
+                             <1 10 0xf08>;
+        };
+
         pmu {
                 compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu";
                 interrupts = <0 68 4>,
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
index 6905e66d4748..18917a0f8604 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
@@ -77,13 +77,18 @@
 
         timer@2c000600 {
                 compatible = "arm,cortex-a5-twd-timer";
-                reg = <0x2c000600 0x38>;
-                interrupts = <1 2 0x304>,
-                             <1 3 0x304>;
+                reg = <0x2c000600 0x20>;
+                interrupts = <1 13 0x304>;
+        };
+
+        watchdog@2c000620 {
+                compatible = "arm,cortex-a5-twd-wdt";
+                reg = <0x2c000620 0x20>;
+                interrupts = <1 14 0x304>;
         };
 
         gic: interrupt-controller@2c001000 {
-                compatible = "arm,corex-a5-gic", "arm,cortex-a9-gic";
+                compatible = "arm,cortex-a5-gic", "arm,cortex-a9-gic";
                 #interrupt-cells = <3>;
                 #address-cells = <0>;
                 interrupt-controller;
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
index da778693be54..3f0c736d31d6 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
@@ -105,8 +105,13 @@
         timer@1e000600 {
                 compatible = "arm,cortex-a9-twd-timer";
                 reg = <0x1e000600 0x20>;
-                interrupts = <1 2 0xf04>,
-                             <1 3 0xf04>;
+                interrupts = <1 13 0xf04>;
+        };
+
+        watchdog@1e000620 {
+                compatible = "arm,cortex-a9-twd-wdt";
+                reg = <0x1e000620 0x20>;
+                interrupts = <1 14 0xf04>;
         };
 
         gic: interrupt-controller@1e001000 {
diff --git a/arch/arm/mach-prima2/irq.c b/arch/arm/mach-prima2/irq.c
index 37c2de9b6f26..a7b9415d30f8 100644
--- a/arch/arm/mach-prima2/irq.c
+++ b/arch/arm/mach-prima2/irq.c
@@ -42,7 +42,8 @@ sirfsoc_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)
 static __init void sirfsoc_irq_init(void)
 {
         sirfsoc_alloc_gc(sirfsoc_intc_base, 0, 32);
-        sirfsoc_alloc_gc(sirfsoc_intc_base + 4, 32, SIRFSOC_INTENAL_IRQ_END - 32);
+        sirfsoc_alloc_gc(sirfsoc_intc_base + 4, 32,
+                        SIRFSOC_INTENAL_IRQ_END + 1 - 32);
 
         writel_relaxed(0, sirfsoc_intc_base + SIRFSOC_INT_RISC_LEVEL0);
         writel_relaxed(0, sirfsoc_intc_base + SIRFSOC_INT_RISC_LEVEL1);
@@ -68,7 +69,8 @@ void __init sirfsoc_of_irq_init(void)
         if (!sirfsoc_intc_base)
                 panic("unable to map intc cpu registers\n");
 
-        irq_domain_add_legacy(np, 32, 0, 0, &irq_domain_simple_ops, NULL);
+        irq_domain_add_legacy(np, SIRFSOC_INTENAL_IRQ_END + 1, 0, 0,
+                &irq_domain_simple_ops, NULL);
 
         of_node_put(np);
 
diff --git a/arch/arm/mach-tegra/flowctrl.c b/arch/arm/mach-tegra/flowctrl.c
index fef66a7486ed..f07488e0bd32 100644
--- a/arch/arm/mach-tegra/flowctrl.c
+++ b/arch/arm/mach-tegra/flowctrl.c
@@ -53,10 +53,10 @@ static void flowctrl_update(u8 offset, u32 value)
 
 void flowctrl_write_cpu_csr(unsigned int cpuid, u32 value)
 {
-        return flowctrl_update(flowctrl_offset_halt_cpu[cpuid], value);
+        return flowctrl_update(flowctrl_offset_cpu_csr[cpuid], value);
 }
 
 void flowctrl_write_cpu_halt(unsigned int cpuid, u32 value)
 {
-        return flowctrl_update(flowctrl_offset_cpu_csr[cpuid], value);
+        return flowctrl_update(flowctrl_offset_halt_cpu[cpuid], value);
 }
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 47cdcca5a7e7..e769ab612627 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -14,7 +14,6 @@
 #include <linux/ata_platform.h>
 #include <linux/smsc911x.h>
 #include <linux/spinlock.h>
-#include <linux/device.h>
 #include <linux/usb/isp1760.h>
 #include <linux/clkdev.h>
 #include <linux/mtd/physmap.h>
@@ -29,7 +28,6 @@
 #include <asm/hardware/gic.h>
 #include <asm/hardware/timer-sp.h>
 #include <asm/hardware/sp810.h>
-#include <asm/hardware/gic.h>
 
 #include <mach/ct-ca9x4.h>
 #include <mach/motherboard.h>
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index f07467533365..5bb48356d217 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -247,7 +247,9 @@ good_area:
         return handle_mm_fault(mm, vma, addr & PAGE_MASK, flags);
 
 check_stack:
-        if (vma->vm_flags & VM_GROWSDOWN && !expand_stack(vma, addr))
+        /* Don't allow expansion below FIRST_USER_ADDRESS */
+        if (vma->vm_flags & VM_GROWSDOWN &&
+            addr >= FIRST_USER_ADDRESS && !expand_stack(vma, addr))
                 goto good_area;
 out:
         return fault;
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 2c7cf2f9c837..aa78de8bfdd3 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -489,7 +489,8 @@ static void __init build_mem_type_table(void)
          */
         for (i = 0; i < ARRAY_SIZE(mem_types); i++) {
                 mem_types[i].prot_pte |= PTE_EXT_AF;
-                mem_types[i].prot_sect |= PMD_SECT_AF;
+                if (mem_types[i].prot_sect)
+                        mem_types[i].prot_sect |= PMD_SECT_AF;
         }
         kern_pgprot |= PTE_EXT_AF;
         vecs_pgprot |= PTE_EXT_AF;
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index bc683b8219b5..b0197b2c857d 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -11,6 +11,7 @@
 #include <linux/types.h>
 #include <linux/cpu.h>
 #include <linux/cpu_pm.h>
+#include <linux/hardirq.h>
 #include <linux/kernel.h>
 #include <linux/notifier.h>
 #include <linux/signal.h>
@@ -432,7 +433,10 @@ void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs)
 
 static void vfp_enable(void *unused)
 {
-        u32 access = get_copro_access();
+        u32 access;
+
+        BUG_ON(preemptible());
+        access = get_copro_access();
 
         /*
          * Enable full access to VFP (cp10 and cp11)
@@ -573,12 +577,6 @@ int vfp_preserve_user_clear_hwstate(struct user_vfp __user *ufp,
          * entry.
          */
         hwstate->fpscr &= ~(FPSCR_LENGTH_MASK | FPSCR_STRIDE_MASK);
-
-        /*
-         * Disable VFP in the hwstate so that we can detect if it gets
-         * used.
-         */
-        hwstate->fpexc &= ~FPEXC_EN;
         return 0;
 }
 
@@ -591,12 +589,8 @@ int vfp_restore_user_hwstate(struct user_vfp __user *ufp,
         unsigned long fpexc;
         int err = 0;
 
-        /*
-         * If VFP has been used, then disable it to avoid corrupting
-         * the new thread state.
-         */
-        if (hwstate->fpexc & FPEXC_EN)
-                vfp_flush_hwstate(thread);
+        /* Disable VFP to avoid corrupting the new thread state. */
+        vfp_flush_hwstate(thread);
 
         /*
          * Copy the floating point registers. There can be unused
@@ -657,7 +651,7 @@ static int __init vfp_init(void)
         unsigned int cpu_arch = cpu_architecture();
 
         if (cpu_arch >= CPU_ARCH_ARMv6)
-                vfp_enable(NULL);
+                on_each_cpu(vfp_enable, NULL, 1);
 
         /*
          * First check that there is a VFP that we can use.
@@ -678,8 +672,6 @@ static int __init vfp_init(void)
         } else {
                 hotcpu_notifier(vfp_hotplug, 0);
 
-                smp_call_function(vfp_enable, NULL, 1);
-
                 VFP_arch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT;  /* Extract the architecture version */
                 printk("implementor %02x architecture %d part %02x variant %x rev %x\n",
                         (vfpsid & FPSID_IMPLEMENTER_MASK) >> FPSID_IMPLEMENTER_BIT,