Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
 "These are bug fixes for harmless problems that were not important
  enough to get fixed in 3.17.  The majority of these are OMAP specific,
  but there are also a couple for Marvell mvebu, cns3xxx, and others, as
  well as some updates for the MAINTAINERS file.

  In particular, Robert Jarzmik and Daniel Mack now volunteered to help
  out maintaining the PXA platform, Krzysztof Halasa took over the
  cns3xxx platform, Carlo Caione is the maintainer for the new Amlogic
  meson platform, and Matthias Brugger is now listed for the mediatek
  platform he recently contributed"

* tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (42 commits)
  MAINTAINERS: update Shawn's email address
  MAINTAINERS: condense some Tegra related entries
  MAINTAINERS: add Alexandre Courbot for Tegra
  MAINTAINERS: CNS3xxx and IXP4xx update.
  MAINTAINERS: Add maintainers entry for Mediatek SoCs
  arm, vt8500, LLVMLlinux: Use mcr instead of mcr% for mach-vt8500
  MAINTAINERS: add a third maintainer to mach-bcm
  CNS3xxx: Fix PCIe read size limit.
  CNS3xxx: Fix logical PCIe topology.
  CNS3xxx: Fix debug UART.
  MAINTAINERS: Add entry for the Amlogic MesonX SoCs
  MAINTAINERS: update ARM pxa maintainers
  ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks
  ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings
  ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
  ARM: Kirkwood: Fix DT based DSA.
  ARM: OMAP2+: make of_device_ids const
  ARM: omap2: make arrays containing machine compatible strings const
  ARM: LPC32xx: Fix reset function
  ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
  ...

diff --combined MAINTAINERS
index 27bd1cc05a6b5cd46bf8c1bf91d8f6dcb98d7207,270d4abffb46ca5a2b4e0abc8b5517fbbb14065f..efc5d4bffac6fa61348ccc36374dc53b0ff6926c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -685,17 -685,6 +685,17 @@@ L:       [email protected] (moderat
  W:    http://blackfin.uclinux.org/
  S:    Supported
  F:    sound/soc/blackfin/*
 + 
 +ANALOG DEVICES INC IIO DRIVERS
 +M:    Lars-Peter Clausen <[email protected]>
 +M:    Michael Hennerich <[email protected]>
 +W:    http://wiki.analog.com/
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/*/ad*
 +X:    drivers/iio/*/adjd*
 +F:    drivers/staging/iio/*/ad*
 +F:    staging/iio/trigger/iio-trig-bfin-timer.c
  
  AOA (Apple Onboard Audio) ALSA DRIVER
  M:    Johannes Berg <[email protected]>
@@@ -846,6 -835,12 +846,12 @@@ M:       Emilio López <[email protected]
  S:    Maintained
  F:    drivers/clk/sunxi/
  
+ ARM/Amlogic MesonX SoC support
+ M:    Carlo Caione <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Maintained
+ N:    meson[x68]
+ 
  ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
  M:    Andrew Victor <[email protected]>
  M:    Nicolas Ferre <[email protected]>
@@@ -872,10 -867,9 +878,9 @@@ S:        Maintaine
  F:    arch/arm/mach-highbank/
  
  ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
- M:    Anton Vorontsov <[email protected]>
+ M:    Krzysztof Halasa <[email protected]>
  S:    Maintained
  F:    arch/arm/mach-cns3xxx/
- T:    git git://git.infradead.org/users/cbou/linux-cns3xxx.git
  
  ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
  M:    Alexander Shiyan <[email protected]>
@@@ -975,7 -969,7 +980,7 @@@ F: arch/arm/include/asm/hardware/dec212
  F:    arch/arm/mach-footbridge/
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
- M:    Shawn Guo <shawn.guo@freescale.com>
+ M:    Shawn Guo <shawn.guo@linaro.org>
  M:    Sascha Hauer <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1036,20 -1030,24 +1041,20 @@@ F:   arch/arm/mach-pxa/colibri-pxa270-inc
  
  ARM/INTEL IOP32X ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IOP33X ARM ARCHITECTURE
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 +S:    Orphan
  
  ARM/INTEL IOP13XX ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
@@@ -1060,7 -1058,7 +1065,7 @@@ S:      Maintaine
  
  ARM/INTEL IXP4XX ARM ARCHITECTURE
  M:    Imre Kaloz <[email protected]>
- M:    Krzysztof Halasa <kh[email protected].pl>
+ M:    Krzysztof Halasa <khalasa@piap.pl>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-ixp4xx/
@@@ -1074,6 -1072,7 +1079,6 @@@ F:      drivers/pcmcia/pxa2xx_stargate2.
  
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
@@@ -1156,6 -1155,16 +1161,16 @@@ W:    http://www.digriz.org.uk/ts78xx/kern
  S:    Maintained
  F:    arch/arm/mach-orion5x/ts78xx-*
  
+ ARM/Mediatek SoC support
+ M:    Matthias Brugger <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/boot/dts/mt6*
+ F:    arch/arm/boot/dts/mt8*
+ F:    arch/arm/mach-mediatek/
+ N:    mtk
+ K:    mediatek
+ 
  ARM/MICREL KS8695 ARCHITECTURE
  M:    Greg Ungerer <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1367,7 -1376,6 +1382,6 @@@ F:      arch/arm/boot/dts/sh
  F:    arch/arm/configs/ape6evm_defconfig
  F:    arch/arm/configs/armadillo800eva_defconfig
  F:    arch/arm/configs/bockw_defconfig
- F:    arch/arm/configs/genmai_defconfig
  F:    arch/arm/configs/koelsch_defconfig
  F:    arch/arm/configs/kzm9g_defconfig
  F:    arch/arm/configs/lager_defconfig
@@@ -1398,17 -1406,12 +1412,17 @@@ S:   Maintaine
  F:    arch/arm/mach-sti/
  F:    arch/arm/boot/dts/sti*
  F:    drivers/clocksource/arm_global_timer.c
 -F:    drivers/reset/sti/
 -F:    drivers/pinctrl/pinctrl-st.c
 -F:    drivers/media/rc/st_rc.c
  F:    drivers/i2c/busses/i2c-st.c
 -F:    drivers/tty/serial/st-asc.c
 +F:    drivers/media/rc/st_rc.c
  F:    drivers/mmc/host/sdhci-st.c
 +F:    drivers/phy/phy-stih407-usb.c
 +F:    drivers/phy/phy-stih41x-usb.c
 +F:    drivers/pinctrl/pinctrl-st.c
 +F:    drivers/reset/sti/
 +F:    drivers/tty/serial/st-asc.c
 +F:    drivers/usb/dwc3/dwc3-st.c
 +F:    drivers/usb/host/ehci-st.c
 +F:    drivers/usb/host/ohci-st.c
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
@@@ -1573,9 -1576,9 +1587,9 @@@ F:      drivers/platform/x86/asus*.
  F:    drivers/platform/x86/eeepc*.c
  
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
 -M:    Dan Williams <[email protected]>
 +R:    Dan Williams <[email protected]>
  W:    http://sourceforge.net/projects/xscaleiop
 -S:    Maintained
 +S:    Odd fixes
  F:    Documentation/crypto/async-tx-api.txt
  F:    crypto/async_tx/
  F:    drivers/dma/
@@@ -1676,12 -1679,6 +1690,12 @@@ M:    Nicolas Ferre <[email protected]
  S:    Supported
  F:    drivers/tty/serial/atmel_serial.c
  
 +ATMEL Audio ALSA driver
 +M:    Bo Shen <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    sound/soc/atmel
 +
  ATMEL DMA DRIVER
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2021,6 -2018,7 +2035,7 @@@ F:      drivers/net/ethernet/broadcom/bnx2x
  BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
  M:    Christian Daudt <[email protected]>
  M:    Matt Porter <[email protected]>
+ M:    Florian Fainelli <[email protected]>
  L:    [email protected]
  T:    git git://github.com/broadcom/mach-bcm
  S:    Maintained
@@@ -2115,7 -2113,7 +2130,7 @@@ S:      Supporte
  F:    drivers/scsi/bfa/
  
  BROCADE BNA 10 GIGABIT ETHERNET DRIVER
 -M:    Rasesh Mody <rmody@brocade.com>
 +M:    Rasesh Mody <rasesh.mody@qlogic.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/brocade/bna/
@@@ -2865,7 -2863,6 +2880,7 @@@ F:      drivers/platform/x86/dell-wmi.
  DESIGNWARE USB2 DRD IP DRIVER
  M:    Paul Zimmerman <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/dwc2/
  
@@@ -2877,13 -2874,6 +2892,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/usb/dwc3/
  
 +DEVICE COREDUMP (DEV_COREDUMP)
 +M:    Johannes Berg <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/base/devcoredump.c
 +F:    include/linux/devcoredump.h
 +
  DEVICE FREQUENCY (DEVFREQ)
  M:    MyungJoo Ham <[email protected]>
  M:    Kyungmin Park <[email protected]>
@@@ -3014,11 -3004,13 +3029,11 @@@ T:   git git://git.linaro.org/people/sumi
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
 -S:    Supported
 +S:    Maintained
  F:    drivers/dma/
  F:    include/linux/dma*
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git
  T:    git git://git.infradead.org/users/vkoul/slave-dma.git (slave-dma)
  
  DME1737 HARDWARE MONITOR DRIVER
@@@ -3035,14 -3027,14 +3050,14 @@@ S:   Supporte
  F:    drivers/acpi/dock.c
  
  DOCUMENTATION
 -M:    Randy Dunlap <[email protected]>
 +M:    Jiri Kosina <[email protected]>
  L:    [email protected]
 -T:    quilt http://www.infradead.org/~rdunlap/Doc/patches/
  S:    Maintained
  F:    Documentation/
  X:    Documentation/ABI/
  X:    Documentation/devicetree/
  X:    Documentation/[a-z][a-z]_[A-Z][A-Z]/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc.git
  
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <[email protected]>
@@@ -4500,6 -4492,7 +4515,6 @@@ M:      Mika Westerberg <mika.westerberg@lin
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/i2c/i2c-acpi.c
  
  I2C-TAOS-EVM DRIVER
  M:    Jean Delvare <[email protected]>
@@@ -4635,9 -4628,6 +4650,9 @@@ F:      drivers/media/rc/iguanair.
  
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <[email protected]>
 +R:    Hartmut Knaack <[email protected]>
 +R:    Lars-Peter Clausen <[email protected]>
 +R:    Peter Meerwald <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/iio/
@@@ -4775,8 -4765,8 +4790,8 @@@ F:      arch/x86/kernel/cpu/microcode/core
  F:    arch/x86/kernel/cpu/microcode/intel*
  
  INTEL I/OAT DMA DRIVER
 -M:    Dan Williams <[email protected]>
  M:    Dave Jiang <[email protected]>
 +R:    Dan Williams <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  S:    Supported
@@@ -4791,12 -4781,12 +4806,12 @@@ F:   drivers/iommu/intel-iommu.
  F:    include/linux/intel-iommu.h
  
  INTEL IOP-ADMA DMA DRIVER
 -M:    Dan Williams <[email protected]>
 +R:    Dan Williams <[email protected]>
  S:    Odd fixes
  F:    drivers/dma/iop-adma.c
  
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
- M:    Krzysztof Halasa <kh[email protected].pl>
+ M:    Krzysztof Halasa <khalasa@piap.pl>
  S:    Maintained
  F:    arch/arm/mach-ixp4xx/include/mach/qmgr.h
  F:    arch/arm/mach-ixp4xx/include/mach/npe.h
@@@ -5505,7 -5495,7 +5520,7 @@@ F:      drivers/macintosh
  LINUX FOR POWERPC EMBEDDED MPC5XXX
  M:    Anatolij Gustschin <[email protected]>
  L:    [email protected]
 -T:    git git://git.denx.de/linux-2.6-agust.git
 +T:    git git://git.denx.de/linux-denx-agust.git
  S:    Maintained
  F:    arch/powerpc/platforms/512x/
  F:    arch/powerpc/platforms/52xx/
@@@ -6449,8 -6439,7 +6464,8 @@@ F:      Documentation/scsi/NinjaSCSI.tx
  F:    drivers/scsi/nsp32*
  
  NTB DRIVER
 -M:    Jon Mason <[email protected]>
 +M:    Jon Mason <[email protected]>
 +M:    Dave Jiang <[email protected]>
  S:    Supported
  W:    https://github.com/jonmason/ntb/wiki
  T:    git git://github.com/jonmason/ntb.git
@@@ -6901,7 -6890,7 +6916,7 @@@ F:      arch/x86/kernel/quirks.
  
  PCI DRIVER FOR IMX6
  M:    Richard Zhu <[email protected]>
 -M:    Shawn Guo <[email protected]>
 +M:    Lucas Stach <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -7079,7 -7068,7 +7094,7 @@@ S:      Maintaine
  F:    drivers/pinctrl/sh-pfc/
  
  PIN CONTROLLER - SAMSUNG
 -M:    Tomasz Figa <t.figa@samsung.com>
 +M:    Tomasz Figa <tomasz.figa@gmail.com>
  M:    Thomas Abraham <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
@@@ -7322,12 -7311,12 +7337,12 @@@ F:   drivers/video/backlight/pwm_bl.
  F:    include/linux/pwm_backlight.h
  
  PXA2xx/PXA3xx SUPPORT
- M:    Eric Miao <[email protected]>
- M:    Russell King <[email protected]>
+ M:    Daniel Mack <[email protected]>
  M:    Haojian Zhuang <[email protected]>
+ M:    Robert Jarzmik <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://github.com/hzhuang1/linux.git
- T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
+ T:    git git://github.com/rjarzmik/linux.git
  S:    Maintained
  F:    arch/arm/mach-pxa/
  F:    drivers/pcmcia/pxa2xx*
@@@ -7623,7 -7612,6 +7638,7 @@@ F:      fs/reiserfs
  
  REGISTER MAP ABSTRACTION
  M:    Mark Brown <[email protected]>
 +L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
  S:    Supported
  F:    drivers/base/regmap/
@@@ -7926,8 -7914,7 +7941,8 @@@ S:      Supporte
  F:    drivers/media/i2c/s5k5baf.c
  
  SAMSUNG SOC CLOCK DRIVERS
 -M:    Tomasz Figa <[email protected]>
 +M:    Sylwester Nawrocki <[email protected]>
 +M:    Tomasz Figa <[email protected]>
  S:    Supported
  L:    [email protected] (moderated for non-subscribers)
  F:    drivers/clk/samsung/
@@@ -7940,19 -7927,6 +7955,19 @@@ S:    Supporte
  L:    [email protected]
  F:    drivers/net/ethernet/samsung/sxgbe/
  
 +SAMSUNG USB2 PHY DRIVER
 +M:    Kamil Debski <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/phy/samsung-phy.txt
 +F:    Documentation/phy/samsung-usb2.txt
 +F:    drivers/phy/phy-exynos4210-usb2.c
 +F:    drivers/phy/phy-exynos4x12-usb2.c
 +F:    drivers/phy/phy-exynos5250-usb2.c
 +F:    drivers/phy/phy-s5pv210-usb2.c
 +F:    drivers/phy/phy-samsung-usb2.c
 +F:    drivers/phy/phy-samsung-usb2.h
 +
  SERIAL DRIVERS
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -8743,14 -8717,6 +8758,14 @@@ W:    http://www.lirc.org
  S:    Odd Fixes
  F:    drivers/staging/media/lirc/
  
 +STAGING - LUSTRE PARALLEL FILESYSTEM
 +M:    Oleg Drokin <[email protected]>
 +M:    Andreas Dilger <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +W:    http://lustre.opensfs.org/
 +S:    Maintained
 +F:    drivers/staging/lustre
 +
  STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
  M:    Julian Andres Klode <[email protected]>
  M:    Marc Dietrich <[email protected]>
@@@ -9044,17 -9010,13 +9059,13 @@@ F:   drivers/media/rc/ttusbir.
  TEGRA ARCHITECTURE SUPPORT
  M:    Stephen Warren <[email protected]>
  M:    Thierry Reding <[email protected]>
+ M:    Alexandre Courbot <[email protected]>
  L:    [email protected]
  Q:    http://patchwork.ozlabs.org/project/linux-tegra/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
  S:    Supported
  N:    [^a-z]tegra
  
- TEGRA ASOC DRIVER
- M:    Stephen Warren <[email protected]>
- S:    Supported
- F:    sound/soc/tegra/
- 
  TEGRA CLOCK DRIVER
  M:    Peter De Schrijver <[email protected]>
  M:    Prashant Gaikwad <[email protected]>
@@@ -9066,11 -9028,6 +9077,6 @@@ M:     Laxman Dewangan <[email protected]
  S:    Supported
  F:    drivers/dma/tegra20-apb-dma.c
  
- TEGRA GPIO DRIVER
- M:    Stephen Warren <[email protected]>
- S:    Supported
- F:    drivers/gpio/gpio-tegra.c
- 
  TEGRA I2C DRIVER
  M:    Laxman Dewangan <[email protected]>
  S:    Supported
@@@ -9087,11 -9044,6 +9093,6 @@@ M:     Laxman Dewangan <[email protected]
  S:    Supported
  F:    drivers/input/keyboard/tegra-kbc.c
  
- TEGRA PINCTRL DRIVER
- M:    Stephen Warren <[email protected]>
- S:    Supported
- F:    drivers/pinctrl/pinctrl-tegra*
- 
  TEGRA PWM DRIVER
  M:    Thierry Reding <[email protected]>
  S:    Supported
@@@ -9717,7 -9669,7 +9718,7 @@@ USB WEBCAM GADGE
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/usb/gadget/function/*uvc*.c
 +F:    drivers/usb/gadget/function/*uvc*
  F:    drivers/usb/gadget/legacy/webcam.c
  
  USB WIRELESS RNDIS DRIVER (rndis_wlan)
@@@ -9931,7 -9883,6 +9932,7 @@@ F:      drivers/scsi/vmw_pvscsi.
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <[email protected]>
  M:    Mark Brown <[email protected]>
 +L:    [email protected]
  W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
@@@ -10120,9 -10071,9 +10121,9 @@@ F:   Documentation/x86
  F:    arch/x86/
  
  X86 PLATFORM DRIVERS
 -M:    Matthew Garrett <[email protected]>
 +M:    Darren Hart <[email protected]>
  L:    [email protected]
 -T:    git git://cavan.codon.org.uk/platform-drivers-x86.git
 +T:    git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git
  S:    Maintained
  F:    drivers/platform/x86/
  
@@@ -10225,12 -10176,6 +10226,12 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/tty/serial/uartlite.c
  
 +XILLYBUS DRIVER
 +M:    Eli Billauer <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/char/xillybus/
 +
  XTENSA XTFPGA PLATFORM SUPPORT
  M:    Max Filippov <[email protected]>
  L:    [email protected]

diff --combined arch/arm/mach-omap2/gpmc.c
index 2f97228f188aa3a835146d81bb7bffc2edcb039d,4b26e5efa7f72273ffcff4d5e855b3d47bf62c5d..a4d52c42a438e15d3b60b8b3494690fa955f7403
--- 1/arch/arm/mach-omap2/gpmc.c
--- 2/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@@ -1207,7 -1207,8 +1207,7 @@@ int gpmc_cs_program_settings(int cs, st
                }
        }
  
 -      if ((p->wait_on_read || p->wait_on_write) &&
 -          (p->wait_pin > gpmc_nr_waitpins)) {
 +      if (p->wait_pin > gpmc_nr_waitpins) {
                pr_err("%s: invalid wait-pin (%d)\n", __func__, p->wait_pin);
                return -EINVAL;
        }
@@@ -1243,7 -1244,7 +1243,7 @@@
  }
  
  #ifdef CONFIG_OF
- static struct of_device_id gpmc_dt_ids[] = {
+ static const struct of_device_id gpmc_dt_ids[] = {
        { .compatible = "ti,omap2420-gpmc" },
        { .compatible = "ti,omap2430-gpmc" },
        { .compatible = "ti,omap3430-gpmc" },   /* omap3430 & omap3630 */
@@@ -1287,8 -1288,8 +1287,8 @@@ void gpmc_read_settings_dt(struct devic
                p->wait_on_write = of_property_read_bool(np,
                                                         "gpmc,wait-on-write");
                if (!p->wait_on_read && !p->wait_on_write)
 -                      pr_warn("%s: read/write wait monitoring not enabled!\n",
 -                              __func__);
 +                      pr_debug("%s: rd/wr wait monitoring not enabled!\n",
 +                               __func__);
        }
  }