linux-sg2042/arch/arm/plat-mxc/devices
Linus Torvalds 34800598b2 ARM: driver specific updates
These are all specific to some driver. They are typically the platform
 side of a change in the drivers directory, such as adding a new driver
 or extending the interface to the platform. In cases where there is no
 maintainer for the driver, or the maintainer prefers to have the
 platform changes in the same branch as the driver changes, the patches
 to the drivers are included as well.
 
 A much smaller set of driver updates that depend on other branches
 getting merged first will be sent later.
 
 The new export of tegra_chip_uid conflicts with other changes in fuse.c.
 In rtc-sa1100.c, the global removal of IRQF_DISABLED conflicts with
 the cleanup of the interrupt handling of that driver.
 
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIVAwUAT24/Y2CrR//JCVInAQLUdw//V4pKPuKempSe1kuD2MJfqldHwEVOlAUt
 of1IhLPAp8tpCscPDQ0yTy3ixquINg4jVnaDLL+E0quVbhLu6hlS2TYNKDEaVAAc
 cPUtVEUdja7Cfu4+bXX2vcWM/UyI6Ax7bsUUcwu4wFnEsjA6qOSu/jYY4jXDguHq
 ODGQSaSz0XQkfVBsWOlO8W/ejb0T3y+Ro3M/Vz5qJsMnZBR8R/i9aUYDFGiZ1GTn
 3APHB7ALz6SS5/9SJS65PH16poBexcea5gyb3gnR1yt30kRmMTOAWrLC+JdyqFaO
 7LHXW514+D1QbWV2gwNCWhQSLbgp9PWq/FXJtq4StW7tgNbDbj1d1Dc1GX+fvk2M
 bBih1yWoIVx6CZWFBQ7gsbqVHUZ/sW2fo76yb8K5dVPXx0fL5lEkv5Xwk3gxbqt5
 lPE8+z+jiL5D+8RK1DZQu1PfxzaMwDZkJkVoGLCcdyM7FvnX3LIYf2bqbcp+zrQL
 lz9aht9C1k12R7feOX8emlluNd3eaKv/6jLrOasUP5wrJDam5hesSD5mLeTlAdxZ
 U8XJe4L24dFv15/yrMCzcyes5EmB3aS3nfb9TsSfq22IOKo2PCQLCnL6Z/rfM+1p
 mGu7BqdBnx3/8NkHdUrttMWjuPNh77MfPM6RO/E+TaBLHtwvKoLWJAHAYQNmt2xH
 IbGcyorBD5s=
 =pQ3X
 -----END PGP SIGNATURE-----

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull "ARM: driver specific updates" from Arnd Bergmann:
 "These are all specific to some driver.  They are typically the
  platform side of a change in the drivers directory, such as adding a
  new driver or extending the interface to the platform.  In cases where
  there is no maintainer for the driver, or the maintainer prefers to
  have the platform changes in the same branch as the driver changes,
  the patches to the drivers are included as well.

  A much smaller set of driver updates that depend on other branches
  getting merged first will be sent later.

  The new export of tegra_chip_uid conflicts with other changes in
  fuse.c.  In rtc-sa1100.c, the global removal of IRQF_DISABLED
  conflicts with the cleanup of the interrupt handling of that driver.

  Signed-off-by: Arnd Bergmann <arnd@arndb.de>"

Fixed up aforementioned trivial conflicts.

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
  ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
  mmc: sdhci-s3c: add platform data for the second capability
  ARM: SAMSUNG: support the second capability for samsung-soc
  ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
  ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
  ARM: EXYNOS: Enable MDMA driver
  regulator: Remove bq24022 regulator driver
  rtc: sa1100: add OF support
  pxa: magician/hx4700: Convert to gpio-regulator from bq24022
  ARM: OMAP3+: SmartReflex: fix error handling
  ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API
  ARM: OMAP3+: SmartReflex: micro-optimization for sanity check
  ARM: OMAP3+: SmartReflex: misc cleanups
  ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument
  ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()
  ARM: OMAP3+: hwmod: add SmartReflex IRQs
  ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need
  ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register
  ARM: OMAP3+: SmartReflex: Add a shutdown hook
  ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP
  ...

Conflicts:
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-tegra/fuse.c
	drivers/rtc/rtc-sa1100.c
2012-03-27 16:41:24 -07:00
..
Kconfig Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:16:43 -07:00
Makefile Merge branches 'imx/pata' and 'imx/sata' into next/driver 2011-10-20 15:17:34 +02:00
platform-ahci-imx.c ARM: mxc: ahci: add clk_prepare/clk_unprepare 2012-02-01 14:27:59 +01:00
platform-fec.c net/fec: gasket needs to be enabled for some i.mx 2011-07-27 09:30:50 +08:00
platform-flexcan.c ARM: mx3: introduce SOC_IMX31 and SOC_IMX35 2010-11-19 21:54:35 +01:00
platform-fsl-usb2-udc.c ARM: mx5: dynamically allocate fsl-usb2-udc devices 2011-08-01 11:16:55 +02:00
platform-gpio-mxc.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
platform-gpio_keys.c ARM: imx: Add gpio-keys to plat-mxc 2010-10-26 16:24:04 +02:00
platform-imx-dma.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
platform-imx-fb.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
platform-imx-i2c.c ARM: mx5: dynamically allocate high speed i2c (imx-i2c actually) 2011-08-01 11:16:56 +02:00
platform-imx-keypad.c ARM: mx53: Add keypad support 2011-07-07 10:01:13 +02:00
platform-imx-ssi.c ARM: mx53: Add SSI suport 2011-07-07 10:01:13 +02:00
platform-imx-uart.c serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-27 09:30:38 +08:00
platform-imx2-wdt.c ARM: mx5: Add watchdog support for MX53 2011-02-18 10:57:56 +01:00
platform-imx21-hcd.c ARM: imx: dynamically allocate imx21-hcd devices 2010-11-17 10:01:33 +01:00
platform-imx_udc.c ARM: imx: dynamically allocate imx_udc device 2010-11-17 10:01:20 +01:00
platform-imxdi_rtc.c ARM: mxc: fix buggy '.end' of IORESOURCE_MEM in device codes 2011-03-23 15:08:14 +01:00
platform-ipu-core.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
platform-mx1-camera.c ARM: imx: dynamically allocate mx1-camera device 2010-11-17 10:01:22 +01:00
platform-mx2-camera.c [media] MX2: Add platform definitions for eMMa-PrP device 2012-02-28 07:20:32 -03:00
platform-mxc-ehci.c ARM: mx5: dynamically allocate mxc-ehci devices 2011-08-01 11:16:55 +02:00
platform-mxc-mmc.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
platform-mxc_nand.c ARM: mx5: introduce SOC_IMX51 2010-12-03 11:05:13 +01:00
platform-mxc_pwm.c ARM: mx5: dynamically allocate pwm devices 2011-01-12 14:50:09 +01:00
platform-mxc_rnga.c ARM: mx3: dynamically allocate mxc_rnga devices 2010-11-19 21:54:35 +01:00
platform-mxc_rtc.c ARM: mx3: dynamically allocate "mxc_rtc" devices 2011-05-19 13:11:16 +02:00
platform-mxc_w1.c ARM: mx3: introduce SOC_IMX31 and SOC_IMX35 2010-11-19 21:54:35 +01:00
platform-pata_imx.c Fix pata imx resource 2011-08-27 20:31:06 +02:00
platform-sdhci-esdhc-imx.c mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx() 2011-07-27 09:31:27 +08:00
platform-spi_imx.c spi/imx: use soc name in spi device type naming scheme 2011-07-14 13:47:02 -06:00