Merge tag 'devicetree-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

Pull DeviceTree updates from Rob Herring:
 "A fairly large (by DT standards) pull request this time with the
  majority being some overdue moving DT binding docs around to
  consolidate similar bindings.

   - DT binding doc consolidation moving similar bindings to common
     locations.  The majority of these are display related which were
     scattered in video/, fb/, drm/, gpu/, and panel/ directories.

   - Add new config option, CONFIG_OF_ALL_DTBS, to enable building all
     dtbs in the tree for most arches with dts files (except powerpc for
     now).

   - OF_IRQ=n fixes for user enabled CONFIG_OF.

   - of_node_put ref counting fixes from Julia Lawall.

   - Common DT binding for wakeup-source and deprecation of all similar
     bindings.

   - DT binding for PXA LCD controller.

   - Allow ignoring failed PCI resource translations in order to ignore
     64-bit addresses on non-LPAE 32-bit kernels.

   - Support setting the NUMA node from DT instead of only from parent
     device.

   - Couple of earlycon DT parsing fixes for address and options"

* tag 'devicetree-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (45 commits)
  MAINTAINERS: update DT binding doc locations
  devicetree: add Sigma Designs vendor prefix
  of: simplify arch_find_n_match_cpu_physical_id() function
  Documentation: arm: Fixed typo in socfpga fpga mgr example
  Documentation: devicetree: fix reference to legacy wakeup properties
  Documentation: devicetree: standardize/consolidate on "wakeup-source" property
  drivers: of: removing assignment of 0 to static variable
  xtensa: enable building of all dtbs
  mips: enable building of all dtbs
  metag: enable building of all dtbs
  metag: use common make variables for dtb builds
  h8300: enable building of all dtbs
  arm64: enable building of all dtbs
  arm: enable building of all dtbs
  arc: enable building of all dtbs
  arc: use common make variables for dtb builds
  of: add config option to enable building of all dtbs
  of/fdt: fix error checking for earlycon address
  of/overlay: add missing of_node_put
  of/platform: add missing of_node_put
  ...

diff --cc Documentation/devicetree/bindings/input/gpio-keys-polled.txt
Simple merge

diff --cc Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt
Simple merge

diff --cc Documentation/devicetree/bindings/leds/backlight/pm8941-wled.txt
Simple merge

diff --cc Documentation/devicetree/bindings/mmc/mmc.txt
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index a79185f78ccdf75cb3f48d1735bbbaff4a773415,5a47e889508431ce6ad09b4814ce744cf52e54cf..8c6cef73e0d7c4f9e597e060151dff255a429044
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -194,8 -192,8 +195,9 @@@ sbs        Smart Battery Syste
  schindler     Schindler
  seagate       Seagate Technology PLC
  semtech       Semtech Corporation
 +sgx   SGX Sensortech
  sharp Sharp Corporation
+ sigma Sigma Designs, Inc.
  sil   Silicon Image
  silabs        Silicon Laboratories
  siliconmitus  Silicon Mitus, Inc.

diff --cc MAINTAINERS
index e2b8cbbfcd8dc6da7599edb33fdd0397ce37f78f,e2aa9736fd0ffbb89b10ed49fbb0da6274b79dce..f56a10a3eabc7b1071107d950621f38921ab64be
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3663,16 -3617,8 +3663,16 @@@ M:    Philipp Zabel <p.zabel@pengutronix.d
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  F:    drivers/gpu/drm/imx/
- F:    Documentation/devicetree/bindings/drm/imx/
+ F:    Documentation/devicetree/bindings/display/imx/
  
 +DRM DRIVERS FOR GMA500 (Poulsbo, Moorestown and derivative chipsets)
 +M:    Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
 +L:    dri-devel@lists.freedesktop.org
 +T:    git git://github.com/patjak/drm-gma500
 +S:    Maintained
 +F:    drivers/gpu/drm/gma500
 +F:    include/drm/gma500*
 +
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <thierry.reding@gmail.com>
  M:    Terje Bergström <tbergstrom@nvidia.com>

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc drivers/of/irq.c
Simple merge

diff --cc drivers/of/of_pci.c
Simple merge

diff --cc include/linux/of_irq.h
index 65d969246a4d02e1ee8854451c923d5003941d31,580818d90475a267aa36d1b757e1e1328bf2f0fb..039f2eec49ced0ae1c638354d1a34c924cebde51
--- 1/include/linux/of_irq.h
--- 2/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@@ -46,11 -46,7 +46,12 @@@ extern int of_irq_get(struct device_nod
  extern int of_irq_get_byname(struct device_node *dev, const char *name);
  extern int of_irq_to_resource_table(struct device_node *dev,
                struct resource *res, int nr_irqs);
 +extern struct irq_domain *of_msi_get_domain(struct device *dev,
 +                                          struct device_node *np,
 +                                          enum irq_domain_bus_token token);
 +extern struct irq_domain *of_msi_map_get_device_domain(struct device *dev,
 +                                                     u32 rid);
+ extern void of_msi_configure(struct device *dev, struct device_node *np);
  #else
  static inline int of_irq_count(struct device_node *dev)
  {
@@@ -69,47 -65,25 +70,43 @@@ static inline int of_irq_to_resource_ta
  {
        return 0;
  }
 +static inline struct irq_domain *of_msi_get_domain(struct device *dev,
 +                                                 struct device_node *np,
 +                                                 enum irq_domain_bus_token token)
 +{
 +      return NULL;
 +}
 +static inline struct irq_domain *of_msi_map_get_device_domain(struct device *dev,
 +                                                            u32 rid)
 +{
 +      return NULL;
 +}
+ static inline void of_msi_configure(struct device *dev, struct device_node *np)
+ {
+ }
  #endif
  
- #if defined(CONFIG_OF)
+ #if defined(CONFIG_OF_IRQ) || defined(CONFIG_SPARC)
  /*
   * irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC
   * implements it differently.  However, the prototype is the same for all,
   * so declare it here regardless of the CONFIG_OF_IRQ setting.
   */
  extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
- extern struct device_node *of_irq_find_parent(struct device_node *child);
- extern void of_msi_configure(struct device *dev, struct device_node *np);
 +u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in);
  
- #else /* !CONFIG_OF */
+ #else /* !CONFIG_OF && !CONFIG_SPARC */
  static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
                                                int index)
  {
        return 0;
  }
- static inline void *of_irq_find_parent(struct device_node *child)
- {
-       return NULL;
- }
- 
 +
 +static inline u32 of_msi_map_rid(struct device *dev,
 +                               struct device_node *msi_np, u32 rid_in)
 +{
 +      return rid_in;
 +}
  #endif /* !CONFIG_OF */
  
  #endif /* __OF_IRQ_H */