Merge branches 'fixes' and 'misc' into for-linus

diff --combined arch/arm/Kconfig
index b259c7c,4e53bf6..3a07864
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -220,9 -220,8 +220,9 @@@ config NEED_MACH_MEMORY_
          be avoided when possible.
  
  config PHYS_OFFSET
 -      hex "Physical address of main memory"
 +      hex "Physical address of main memory" if MMU
        depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H
 +      default DRAM_BASE if !MMU
        help
          Please provide the physical address corresponding to the
          location of main memory in your system.
@@@ -258,6 -257,7 +258,7 @@@ config ARCH_INTEGRATO
        select ARCH_HAS_CPUFREQ
        select CLKDEV_LOOKUP
        select HAVE_MACH_CLKDEV
+       select HAVE_TCM
        select ICST
        select GENERIC_CLOCKEVENTS
        select PLAT_VERSATILE
@@@ -1126,6 -1126,11 +1127,11 @@@ config ARM_TIMER_SP80
  
  source arch/arm/mm/Kconfig
  
+ config ARM_NR_BANKS
+       int
+       default 16 if ARCH_EP93XX
+       default 8
+ 
  config IWMMXT
        bool "Enable iWMMXt support"
        depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4
@@@ -1246,7 -1251,7 +1252,7 @@@ config PL310_ERRATA_58836
  
  config ARM_ERRATA_720789
        bool "ARM errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID"
 -      depends on CPU_V7 && SMP
 +      depends on CPU_V7
        help
          This option enables the workaround for the 720789 Cortex-A9 (prior to
          r2p0) erratum. A faulty ASID can be sent to the other CPUs for the
@@@ -1282,7 -1287,7 +1288,7 @@@ config ARM_ERRATA_74362
  
  config ARM_ERRATA_751472
        bool "ARM errata: Interrupted ICIALLUIS may prevent completion of broadcasted operation"
 -      depends on CPU_V7 && SMP
 +      depends on CPU_V7
        help
          This option enables the workaround for the 751472 Cortex-A9 (prior
          to r3p0) erratum. An interrupted ICIALLUIS operation may prevent the
@@@ -1560,6 -1565,16 +1566,16 @@@ config LOCAL_TIMER
          accounting to be spread across the timer interval, preventing a
          "thundering herd" at every timer tick.
  
+ config ARCH_NR_GPIO
+       int
+       default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
+       default 350 if ARCH_U8500
+       default 0
+       help
+         Maximum number of GPIOs in the system.
+ 
+         If unsure, leave the default value.
+ 
  source kernel/Kconfig.preempt
  
  config HZ

diff --combined arch/arm/mm/proc-v7.S
index e70a737,ea679ec..69a98a4
--- 1/arch/arm/mm/proc-v7.S
--- 2/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@@ -284,6 -284,7 +284,7 @@@ __v7_ca5mp_setup
  __v7_ca9mp_setup:
        mov     r10, #(1 << 0)                  @ TLB ops broadcasting
        b       1f
+ __v7_ca7mp_setup:
  __v7_ca15mp_setup:
        mov     r10, #0
  1:
@@@ -363,13 -364,11 +364,13 @@@ __v7_setup
        orreq   r10, r10, #1 << 6               @ set bit #6
        mcreq   p15, 0, r10, c15, c0, 1         @ write diagnostic register
  #endif
 -#ifdef CONFIG_ARM_ERRATA_751472
 -      cmp     r6, #0x30                       @ present prior to r3p0
 +#if defined(CONFIG_ARM_ERRATA_751472) && defined(CONFIG_SMP)
 +      ALT_SMP(cmp r6, #0x30)                  @ present prior to r3p0
 +      ALT_UP_B(1f)
        mrclt   p15, 0, r10, c15, c0, 1         @ read diagnostic register
        orrlt   r10, r10, #1 << 11              @ set bit #11
        mcrlt   p15, 0, r10, c15, c0, 1         @ write diagnostic register
 +1:
  #endif
  
  3:    mov     r10, #0
@@@ -465,6 -464,16 +466,16 @@@ __v7_ca5mp_proc_info
        .size   __v7_ca5mp_proc_info, . - __v7_ca5mp_proc_info
  
        /*
+        * ARM Ltd. Cortex A7 processor.
+        */
+       .type   __v7_ca7mp_proc_info, #object
+ __v7_ca7mp_proc_info:
+       .long   0x410fc070
+       .long   0xff0ffff0
+       __v7_proc __v7_ca7mp_setup, hwcaps = HWCAP_IDIV
+       .size   __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info
+ 
+       /*
         * ARM Ltd. Cortex A9 processor.
         */
        .type   __v7_ca9mp_proc_info, #object