Merge branch 'spear/13xx' into next/soc2

* spear/13xx:
  pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res
  SPEAr: Update MAINTAINERS and Documentation
  SPEAr13xx: Add defconfig
  SPEAr13xx: Add compilation support
  SPEAr13xx: Add dts and dtsi files
  pinctrl: Add SPEAr13xx pinctrl drivers
  pinctrl: SPEAr: Create macro for declaring GPIO PINS
  SPEAr13xx: Add common clock framework support
  SPEAr13xx: Add source files
  SPEAr13xx: Add header files

Depends on clock, pinctrl and dt branches to go first.

Signed-off-by: Arnd Bergmann <[email protected]>

diff --combined MAINTAINERS
index b36270986501dd41fe33280388ea2f7e9c3c9720,3139e56f8790ca8335a0b6b630a0df6fbf54ee51..fa81a16e4641b5dd13048604c9ee7699ceb8d6e8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1882,6 -1882,16 +1882,16 @@@ F:    Documentation/filesystems/coda.tx
  F:    fs/coda/
  F:    include/linux/coda*.h
  
+ COMMON CLK FRAMEWORK
+ M:    Mike Turquette <[email protected]>
+ M:    Mike Turquette <[email protected]>
+ L:    [email protected] (same as CLK API & CLKDEV)
+ T:    git git://git.linaro.org/people/mturquette/linux.git
+ S:    Maintained
+ F:    drivers/clk/clk.c
+ F:    drivers/clk/clk-*
+ F:    include/linux/clk-pr*
+ 
  COMMON INTERNET FILE SYSTEM (CIFS)
  M:    Steve French <[email protected]>
  L:    [email protected]
@@@ -1968,9 -1978,10 +1978,9 @@@ S:     Maintaine
  F:    drivers/net/ethernet/ti/cpmac.c
  
  CPU FREQUENCY DRIVERS
 -M:    Dave Jones <[email protected]>
 +M:    Rafael J. Wysocki <[email protected]>
  L:    [email protected]
 -W:    http://www.codemonkey.org.uk/projects/cpufreq/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
 +L:    [email protected]
  S:    Maintained
  F:    drivers/cpufreq/
  F:    include/linux/cpufreq.h
@@@ -3591,7 -3602,6 +3601,7 @@@ S:      Supporte
  F:    drivers/net/wireless/iwlegacy/
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
 +M:    Johannes Berg <[email protected]>
  M:    Wey-Yi Guy <[email protected]>
  M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
@@@ -4036,7 -4046,6 +4046,7 @@@ F:      Documentation/scsi/53c700.tx
  F:    drivers/scsi/53c700*
  
  LED SUBSYSTEM
 +M:    Bryan Wu <[email protected]>
  M:    Richard Purdie <[email protected]>
  S:    Maintained
  F:    drivers/leds/
@@@ -5235,6 -5244,14 +5245,14 @@@ M:    Linus Walleij <linus.walleij@linaro.
  S:    Maintained
  F:    drivers/pinctrl/
  
+ PIN CONTROLLER - ST SPEAR
+ M:    Viresh Kumar <[email protected]>
+ L:    [email protected]
+ L:    [email protected] (moderated for non-subscribers)
+ W:    http://www.st.com/spear
+ S:    Maintained
+ F:    driver/pinctrl/spear/
+ 
  PKTCDVD DRIVER
  M:    Peter Osterlund <[email protected]>
  S:    Maintained
@@@ -5892,11 -5909,11 +5910,11 @@@ F:   Documentation/scsi/st.tx
  F:    drivers/scsi/st*
  
  SCTP PROTOCOL
 -M:    Vlad Yasevich <vladislav.yasevich@hp.com>
 +M:    Vlad Yasevich <vyasevich@gmail.com>
  M:    Sridhar Samudrala <[email protected]>
  L:    [email protected]
  W:    http://lksctp.sourceforge.net
 -S:    Supported
 +S:    Maintained
  F:    Documentation/networking/sctp.txt
  F:    include/linux/sctp.h
  F:    include/net/sctp/
@@@ -6299,52 -6316,48 +6317,48 @@@ F:   include/linux/compiler.
  
  SPEAR PLATFORM SUPPORT
  M:    Viresh Kumar <[email protected]>
+ M:    Shiraz Hashim <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
  F:    arch/arm/plat-spear/
  
- SPEAR3XX MACHINE SUPPORT
+ SPEAR13XX MACHINE SUPPORT
  M:    Viresh Kumar <[email protected]>
+ M:    Shiraz Hashim <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
- F:    arch/arm/mach-spear3xx/
+ F:    arch/arm/mach-spear13xx/
  
- SPEAR6XX MACHINE SUPPORT
- M:    Rajeev Kumar <[email protected]>
+ SPEAR3XX MACHINE SUPPORT
+ M:    Viresh Kumar <[email protected]>
+ M:    Shiraz Hashim <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
- F:    arch/arm/mach-spear6xx/
+ F:    arch/arm/mach-spear3xx/
  
- SPEAR CLOCK FRAMEWORK SUPPORT
+ SPEAR6XX MACHINE SUPPORT
+ M:    Rajeev Kumar <[email protected]>
+ M:    Shiraz Hashim <[email protected]>
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
- F:    arch/arm/mach-spear*/clock.c
- F:    arch/arm/plat-spear/clock.c
- F:    arch/arm/plat-spear/include/plat/clock.h
+ F:    arch/arm/mach-spear6xx/
  
- SPEAR PAD MULTIPLEXING SUPPORT
+ SPEAR CLOCK FRAMEWORK SUPPORT
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
- F:    arch/arm/plat-spear/include/plat/padmux.h
- F:    arch/arm/plat-spear/padmux.c
- F:    arch/arm/mach-spear*/spear*xx.c
- F:    arch/arm/mach-spear*/include/mach/generic.h
- F:    arch/arm/mach-spear3xx/spear3*0.c
- F:    arch/arm/mach-spear3xx/spear3*0_evb.c
- F:    arch/arm/mach-spear6xx/spear600.c
- F:    arch/arm/mach-spear6xx/spear600_evb.c
+ F:    drivers/clk/spear/
  
  SPI SUBSYSTEM
  M:    Grant Likely <[email protected]>
@@@ -7579,8 -7592,8 +7593,8 @@@ F:      Documentation/filesystems/xfs.tx
  F:    fs/xfs/
  
  XILINX AXI ETHERNET DRIVER
 -M:    Ariane Keller <[email protected]>
 -M:    Daniel Borkmann <[email protected]>
 +M:    Anirudha Sarangi <[email protected]>
 +M:    John Linn <[email protected]>
  S:    Maintained
  F:    drivers/net/ethernet/xilinx/xilinx_axienet*
  

diff --combined arch/arm/Kconfig
index 36586dba6fa6e0af6260dce3827cfe1495c7f592,ce030c24264409e00a0fd59462322f8876074f15..75066ed1f649d36cd12d23401eafa93e84b5a794
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -980,6 -980,7 +980,7 @@@ config PLAT_SPEA
        select ARM_AMBA
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
+       select COMMON_CLK
        select CLKSRC_MMIO
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK
@@@ -1186,15 -1187,6 +1187,15 @@@ if !MM
  source "arch/arm/Kconfig-nommu"
  endif
  
 +config ARM_ERRATA_326103
 +      bool "ARM errata: FSR write bit incorrect on a SWP to read-only memory"
 +      depends on CPU_V6
 +      help
 +        Executing a SWP instruction to read-only memory does not set bit 11
 +        of the FSR on the ARM 1136 prior to r1p0. This causes the kernel to
 +        treat the access as a read, preventing a COW from occurring and
 +        causing the faulting task to livelock.
 +
  config ARM_ERRATA_411920
        bool "ARM errata: Invalidation of the Instruction Cache operation can fail"
        depends on CPU_V6 || CPU_V6K