linux_dsm_epyc7002/arch/arm/plat-mxc/include/mach
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
..
3ds_debugboard.h
board-mx31lilly.h
board-mx31lite.h
board-mx31moboard.h
board-pcm038.h
clock.h
common.h ARM: mx3: Setup AIPS registers 2012-03-02 08:49:37 +01:00
debug-macro.S ARM: imx6: Rename DEBUG_IMX6Q_UART to UART4 2012-02-27 15:17:32 +08:00
devices-common.h [media] MX2: Add platform definitions for eMMa-PrP device 2012-02-28 07:20:32 -03:00
dma.h ARM: mxc: make imx_dma_is_general_purpose more generic for sdma 2012-02-27 15:17:58 +08:00
esdhc.h mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
eukrea-baseboards.h
gpio.h Merge branch 'highbank/soc' into next/soc 2011-11-02 02:46:10 +01:00
hardware.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01:00
i2c.h i2c-imx: remove init/exit hooks from platform data 2011-09-14 22:14:41 +01:00
iim.h
imx-uart.h
imxfb.h
io.h arm/imx: remove cpu_is_xxx() check from __imx_ioremap() 2011-10-04 10:55:12 +02:00
iomux-mx1.h
iomux-mx2x.h mx2/iomux: Set direction for CSPI2 pins 2011-03-25 08:21:34 +01:00
iomux-mx3.h mx31moboard: Add poweroff support 2011-09-20 14:53:00 +02:00
iomux-mx21.h
iomux-mx25.h iomux-mx25.h slew rate adjusted for LCD __LD pins 2012-03-13 13:57:07 +01:00
iomux-mx27.h
iomux-mx35.h ARM: imx35: fix ATA_DATA3 pad control address 2011-03-07 19:29:09 +01:00
iomux-mx50.h ARM: imx50: correct iomux-mx50.h wrong daisy chain settings 2011-02-18 11:01:34 +01:00
iomux-mx51.h ARM: i.MX51: clean up iomux-mx51.h 2011-08-17 08:41:23 +02:00
iomux-mx53.h ARM: i.MX53: clean up iomux-mx53.h 2011-08-17 08:43:32 +02:00
iomux-v1.h ARM: imx: iomux-v1.h: Fix build error due to __init annotation 2012-01-26 12:56:37 +01:00
iomux-v3.h Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
ipu.h
iram.h
irqs.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01:00
mmc.h
mx1_camera.h
mx1.h ARM: plat-mxc: remove inclusion of <mach/vmalloc.h> 2011-11-15 22:30:39 -05:00
mx2_cam.h
mx2x.h
mx3_camera.h
mx3fb.h video i.MX IPU: Fix display connections 2011-12-08 12:59:03 +05:30
mx3x.h ARM: mx35: use generic function for displaying silicon revision 2011-08-26 08:50:59 +02:00
mx6q.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01:00
mx21-usbhost.h
mx21.h
mx25.h Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features 2011-09-29 10:40:29 +02:00
mx27.h arm/imx: remove mx27_setup_weimcs() from mx27.h 2011-10-17 21:41:03 +02:00
mx31.h arm/imx: remove mx31_setup_weimcs() from mx31.h 2011-10-17 21:41:03 +02:00
mx35.h ARM: imx: Add PATA resources for other i.MX processors 2011-08-24 10:11:40 +02:00
mx50.h ARM: mx50: Add support to get the silicon revision 2011-03-23 15:08:15 +01:00
mx51.h Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup 2011-09-20 10:09:08 +02:00
mx53.h ARM: mx5/mm: consolidate TZIC map code 2011-09-20 09:55:06 +02:00
mxc_ehci.h usb: otg: Rename otg_transceiver to usb_phy 2012-02-13 13:34:36 +02:00
mxc_nand.h Fix common misspellings 2011-03-31 11:26:23 -03:00
mxc.h ARM: mx5: use generic irq chip pm interface for pm functions on 2011-12-25 12:02:28 +08:00
sdma.h dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
spi.h
ssi.h
timex.h ARM i.MX: define CLOCK_TICK_RATE to bogus value 2011-07-07 09:59:58 +02:00
ulpi.h usb: otg: ulpi: Start using struct usb_otg 2012-02-13 13:35:56 +02:00
uncompress.h enable uncompress log on cpuimx35sd 2011-12-19 12:26:09 +01:00
usb.h