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

Pull DeviceTree updates from Rob Herring:

 - new tool 'dtx_diff' to diff DT files

 - sync kernel's dtc/libfdt to current dtc repo master

 - fix for reserved memory regions located in highmem

 - document standard unit suffixes for DT properties

 - various DT binding doc updates

* tag 'devicetree-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of: Add vendor prefix for eGalax_eMPIA Technology Inc
  Input: ads7846: Add description how to use internal reference (ADS7846)
  ARM: realview: add EB syscon variants to bindings
  devicetree: bindings: ARM: Use "uV" for micro-volt
  serial: fsl-imx-uart: Fix typo in fsl,dte-mode description
  of: add 'const' for of_property_*_string*() parameter '*np'
  of/unittest: fix infinite loop in of_unittest_destroy_tracked_overlays()
  of: alloc anywhere from memblock if range not specified
  kbuild: Allow using host dtc instead of kernel's copy
  of: resolver: Add missing of_node_get and of_node_put
  of: Add United Radiant Technology Corporation vendor prefix
  dt/bindings: add documentation on standard property unit suffixes
  scripts/dtc: Update to upstream commit b06e55c88b9b
  ARM: boot: Add an implementation of strnlen for libfdt
  scripts/dtc: dtx_diff - add info to error message
  dtc: create tool to diff device trees

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index 156731cc649cd3f6c17972b6668f40d8b2089cd6,539471e7c2d261c1fd226743d1407b0a549b4467..787d4225c8ab2cdc1219ac265e1252d8b89f9773
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -28,7 -28,6 +28,7 @@@ arm   ARM Ltd
  armadeus      ARMadeus Systems SARL
  artesyn       Artesyn Embedded Technologies Inc.
  asahi-kasei   Asahi Kasei Corp.
 +atlas Atlas Scientific LLC
  atmel Atmel Corporation
  auo   AU Optronics Corporation
  avago Avago Technologies
@@@ -72,6 -71,7 +72,7 @@@ dmo   Data Modul A
  ea    Embedded Artists AB
  ebv   EBV Elektronik
  edt   Emerging Display Technologies
+ eeti  eGalax_eMPIA Technology Inc
  elan  Elan Microelectronic Corp.
  emmicro       EM Microelectronic
  energymicro   Silicon Laboratories (formerly Energy Micro AS)
@@@ -112,7 -112,6 +113,7 @@@ hp Hewlett Packar
  i2se  I2SE GmbH
  ibm   International Business Machines (IBM)
  idt   Integrated Device Technologies, Inc.
 +ifi   Ingenieurburo Fur Ic-Technologie (I/F/I)
  iom   Iomega Corporation
  img   Imagination Technologies Ltd.
  ingenic       Ingenic Semiconductor
@@@ -122,7 -121,6 +123,7 @@@ intercontrol       Inter Control Grou
  invensense    InvenSense Inc.
  isee  ISEE 2007 S.L.
  isil  Intersil
 +issi  Integrated Silicon Solutions Inc.
  jedec JEDEC Solid State Technology Association
  karo  Ka-Ro electronics GmbH
  keymile       Keymile GmbH
@@@ -173,7 -171,6 +174,7 @@@ opencores  OpenCores.or
  option        Option NV
  ortustech     Ortus Technology Co., Ltd.
  ovti  OmniVision Technologies
 +ORCL  Oracle Corporation
  panasonic     Panasonic Corporation
  parade        Parade Technologies Inc.
  pericom       Pericom Technology Inc.
@@@ -208,7 -205,6 +209,7 @@@ seagate    Seagate Technology PL
  semtech       Semtech Corporation
  sgx   SGX Sensortech
  sharp Sharp Corporation
 +si-en Si-En Technology Ltd.
  sigma Sigma Designs, Inc.
  sil   Silicon Image
  silabs        Silicon Laboratories
@@@ -231,9 -227,7 +232,9 @@@ st STMicroelectronic
  startek       Startek
  ste   ST-Ericsson
  stericsson    ST-Ericsson
 +syna  Synaptics Inc.
  synology      Synology, Inc.
 +SUNW  Sun Microsystems, Inc
  tbs   TBS Technologies
  tcl   Toby Churchill Ltd.
  technologic   Technologic Systems
@@@ -247,6 -241,7 +248,7 @@@ tplink     TP-LINK Technologies Co., Ltd
  tronfy        Tronfy
  truly Truly Semiconductors Limited
  upisemi       uPI Semiconductor Corp.
+ urt   United Radiant Technology Corporation
  usi   Universal Scientific Industrial Co., Ltd.
  v3    V3 Semiconductor
  variscite     Variscite Ltd.

diff --combined include/linux/of.h
index dc6e39696b64c8e925601f598b9cdab5684f1970,588fdd5d21adbb3247ed2772554573b57e379184..7fcb681baadf172824017d067721c65189638565
--- 1/include/linux/of.h
--- 2/include/linux/of.h
+++ b/include/linux/of.h
@@@ -296,13 -296,13 +296,13 @@@ extern int of_property_read_u64_array(c
                                      u64 *out_values,
                                      size_t sz);
  
- extern int of_property_read_string(struct device_node *np,
+ extern int of_property_read_string(const struct device_node *np,
                                   const char *propname,
                                   const char **out_string);
- extern int of_property_match_string(struct device_node *np,
+ extern int of_property_match_string(const struct device_node *np,
                                    const char *propname,
                                    const char *string);
- extern int of_property_read_string_helper(struct device_node *np,
+ extern int of_property_read_string_helper(const struct device_node *np,
                                              const char *propname,
                                              const char **out_strs, size_t sz, int index);
  extern int of_device_is_compatible(const struct device_node *device,
@@@ -538,14 -538,14 +538,14 @@@ static inline int of_property_read_u64_
        return -ENOSYS;
  }
  
- static inline int of_property_read_string(struct device_node *np,
+ static inline int of_property_read_string(const struct device_node *np,
                                          const char *propname,
                                          const char **out_string)
  {
        return -ENOSYS;
  }
  
- static inline int of_property_read_string_helper(struct device_node *np,
+ static inline int of_property_read_string_helper(const struct device_node *np,
                                                 const char *propname,
                                                 const char **out_strs, size_t sz, int index)
  {
@@@ -571,7 -571,7 +571,7 @@@ static inline int of_property_read_u64(
        return -ENOSYS;
  }
  
- static inline int of_property_match_string(struct device_node *np,
+ static inline int of_property_match_string(const struct device_node *np,
                                           const char *propname,
                                           const char *string)
  {
@@@ -773,7 -773,7 +773,7 @@@ static inline int of_property_count_u64
   *
   * If @out_strs is NULL, the number of strings in the property is returned.
   */
- static inline int of_property_read_string_array(struct device_node *np,
+ static inline int of_property_read_string_array(const struct device_node *np,
                                                const char *propname, const char **out_strs,
                                                size_t sz)
  {
@@@ -792,7 -792,7 +792,7 @@@
   * does not have a value, and -EILSEQ if the string is not null-terminated
   * within the length of the property data.
   */
- static inline int of_property_count_strings(struct device_node *np,
+ static inline int of_property_count_strings(const struct device_node *np,
                                            const char *propname)
  {
        return of_property_read_string_helper(np, propname, NULL, 0, 0);
@@@ -816,7 -816,7 +816,7 @@@
   *
   * The out_string pointer is modified only if a valid string can be decoded.
   */
- static inline int of_property_read_string_index(struct device_node *np,
+ static inline int of_property_read_string_index(const struct device_node *np,
                                                const char *propname,
                                                int index, const char **output)
  {
@@@ -929,7 -929,7 +929,7 @@@ static inline int of_get_available_chil
        return num;
  }
  
 -#ifdef CONFIG_OF
 +#if defined(CONFIG_OF) && !defined(MODULE)
  #define _OF_DECLARE(table, name, compat, fn, fn_type)                 \
        static const struct of_device_id __of_table_##name              \
                __used __section(__##table##_of_table)                  \