]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Nov 2013 07:52:17 +0000 (16:52 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Nov 2013 07:52:17 +0000 (16:52 +0900)
commit10d0c9705e80bbd3d587c5fad24599aabaca6688
tree9456083a1b04b8d98da08d88e937cfeff80e2a7d
parent85b656cf1560e27a89354a23f2c10ba229d2f173
parentc11eede69b6ad0ac44ebc1e021a8d2699c5f1f8f
Merge tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree updates from Rob Herring:
 "DeviceTree updates for 3.13.  This is a bit larger pull request than
  usual for this cycle with lots of clean-up.

   - Cross arch clean-up and consolidation of early DT scanning code.
   - Clean-up and removal of arch prom.h headers.  Makes arch specific
     prom.h optional on all but Sparc.
   - Addition of interrupts-extended property for devices connected to
     multiple interrupt controllers.
   - Refactoring of DT interrupt parsing code in preparation for
     deferred probe of interrupts.
   - ARM cpu and cpu topology bindings documentation.
   - Various DT vendor binding documentation updates"

* tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (82 commits)
  powerpc: add missing explicit OF includes for ppc
  dt/irq: add empty of_irq_count for !OF_IRQ
  dt: disable self-tests for !OF_IRQ
  of: irq: Fix interrupt-map entry matching
  MIPS: Netlogic: replace early_init_devtree() call
  of: Add Panasonic Corporation vendor prefix
  of: Add Chunghwa Picture Tubes Ltd. vendor prefix
  of: Add AU Optronics Corporation vendor prefix
  of/irq: Fix potential buffer overflow
  of/irq: Fix bug in interrupt parsing refactor.
  of: set dma_mask to point to coherent_dma_mask
  of: add vendor prefix for PHYTEC Messtechnik GmbH
  DT: sort vendor-prefixes.txt
  of: Add vendor prefix for Cadence
  of: Add empty for_each_available_child_of_node() macro definition
  arm/versatile: Fix versatile irq specifications.
  of/irq: create interrupts-extended property
  microblaze/pci: Drop PowerPC-ism from irq parsing
  of/irq: Create of_irq_parse_and_map_pci() to consolidate arch code.
  of/irq: Use irq_of_parse_and_map()
  ...
30 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arc/kernel/setup.c
arch/arm/mach-integrator/pci_v3.c
arch/arm/mm/init.c
arch/arm64/kernel/setup.c
arch/metag/kernel/setup.c
arch/microblaze/kernel/timer.c
arch/mips/ralink/of.c
arch/powerpc/include/asm/prom.h
arch/powerpc/kernel/prom.c
arch/powerpc/platforms/8xx/tqm8xx_setup.c
arch/powerpc/platforms/embedded6xx/hlwd-pic.c
arch/powerpc/platforms/powernv/opal.c
arch/powerpc/sysdev/mpic.c
drivers/gpio/gpio-mpc8xxx.c
drivers/net/ethernet/freescale/gianfar.c
drivers/net/ethernet/ibm/emac/mal.c
drivers/of/Kconfig
drivers/of/base.c
drivers/of/fdt.c
drivers/of/platform.c
drivers/pci/host/pci-mvebu.c
drivers/spi/spi-fsl-cpm.c
drivers/spi/spi-fsl-espi.c
drivers/spi/spi-mpc512x-psc.c
drivers/spi/spi-ppc4xx.c
drivers/tty/serial/pmac_zilog.c
drivers/tty/serial/ucc_uart.c
drivers/usb/host/ehci-ppc-of.c
include/linux/of.h