2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-06 04:33:58 +08:00
linux-next/Documentation/devicetree/bindings
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
..
arm ARM: driver specific updates 2012-03-27 16:41:24 -07:00
ata ahci: add DT binding for Calxeda AHCI controller 2011-11-03 15:52:38 -05:00
c6x C6X: devicetree support 2011-10-06 19:47:33 -04:00
crypto crypto: picoxcell - support for device tree matching 2011-08-10 19:00:26 +08:00
dma ARM: dt: tegra: Add Tegra APB DMA device tree binding 2012-02-06 18:21:20 -08:00
fb Fix common misspellings 2011-03-31 11:26:23 -03:00
gpio Merge branch 'next/fixes-non-critical' into next/drivers 2012-03-20 22:42:24 +00:00
hwmon hwmon: (ads1015) Make gain and datarate configurable 2011-03-21 17:59:37 +01:00
i2c i2c: add CSR SiRFprimaII on-chip I2C controllers driver 2012-03-07 19:05:04 +01:00
input Input: tegra-kbc - revise device tree support 2012-03-13 21:37:07 -07:00
mfd mfd: Improve mc13xxx dt binding document 2012-01-09 00:37:46 +01:00
mmc mmc: sdhci-tegra: Add 8-bit support to device tree binding. 2011-10-26 15:43:42 -04:00
mtd mtd: gpio-nand: add device tree bindings 2012-01-09 18:23:58 +00:00
net stmmac: Add device-tree support 2012-03-16 22:48:53 -07:00
nvec staging: nvec: add device tree support 2011-11-26 17:17:14 -08:00
pci
pinmux arm/dt: Tegra: Add pinmux node to tegra20.dtsi 2011-10-11 17:19:56 -07:00
power_supply devicetree-bindings: Propagate bq20z75->sbs rename to dt bindings 2012-01-06 05:25:53 +04:00
powerpc powerpc: document the FSL MPIC message register binding 2012-03-16 16:15:28 -05:00
regulator regulator: twl-regulator: Add fixed LDO for V1V8, V2V1 supply 2012-03-11 20:09:18 +00:00
rtc drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030 2012-01-10 16:30:53 -08:00
serial power management changes for omap and imx 2012-01-09 14:39:59 -08:00
serio altera_ps2: Add devicetree support 2011-02-15 21:39:21 -07:00
sound ASoC: fsl: add dt support for imx-audmux 2012-03-06 12:44:21 +00:00
spi spi/omap: Add DT support to McSPI driver 2012-02-15 12:57:00 -07:00
tty/serial serial/efm32: add new driver 2012-01-26 11:29:47 -08:00
usb arm/dt: add basic usb nodes to tegra device trees 2011-12-07 20:47:47 -08:00
virtio virtio: Add platform bus driver for memory mapped virtio device 2011-11-02 11:41:01 +10:30
watchdog watchdog: imx2_wdt: add device tree probe support 2011-07-26 21:19:16 +00:00
x86 x86: dt: Correct local apic documentation in device tree bindings 2011-02-28 09:58:06 +01:00
eeprom.txt
marvell.txt
open-pic.txt powerpc: Document the Open PIC device tree binding 2011-03-21 11:00:52 +11:00
resource-names.txt of/irq: Add interrupts-names property to name an irq resource 2012-01-04 00:33:15 -07:00
vendor-prefixes.txt Updates of sound stuff for 3.4-rc1 2012-03-22 13:00:13 -07:00
xilinx.txt