Commit 31e18236 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 1200b680 5027e19d

Documentation/devicetree/bindings/arm/arm-boards

+3 −1
Original line number Diff line number Diff line
@@ -123,7 +123,9 @@ Required nodes: 


- syscon: some subnode of the RealView SoC node must be a

  system controller node pointing to the control registers,

  with the compatible string set to one of these tuples:

  with the compatible string set to one of these:

   "arm,realview-eb11mp-revb-syscon", "arm,realview-eb-syscon", "syscon"

   "arm,realview-eb11mp-revc-syscon", "arm,realview-eb-syscon", "syscon"

   "arm,realview-eb-syscon", "syscon"

   "arm,realview-pb1176-syscon", "syscon"

   "arm,realview-pb11mp-syscon", "syscon"

Documentation/devicetree/bindings/arm/cpus.txt

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ nodes to be present and contain the properties described below. 
		Usage: optional

		Value type: <prop-encoded-array>

		Definition: A u32 value that represents the running time dynamic

			    power coefficient in units of mW/MHz/uVolt^2. The

			    power coefficient in units of mW/MHz/uV^2. The

			    coefficient can either be calculated from power

			    measurements or derived by analysis.

Documentation/devicetree/bindings/input/ads7846.txt

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ Optional properties: 
	ti,vref-delay-usecs		vref supply delay in usecs, 0 for

					external vref (u16).

	ti,vref-mv			The VREF voltage, in millivolts (u16).

					Set to 0 to use internal refernce

					(ADS7846).

	ti,keep-vref-on			set to keep vref on for differential

					measurements as well

	ti,swap-xy			swap x and y axis

Documentation/devicetree/bindings/property-units.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
Standard Unit Suffixes for Property names



Properties which have a unit of measure are recommended to have a unit

suffix appended to the property name. The list below contains the

recommended suffixes. Other variations exist in bindings, but should not

be used in new bindings or added here. The inconsistency in the unit

prefixes is due to selecting the most commonly used variants.



It is also recommended to use the units listed here and not add additional

unit prefixes.



Time/Frequency

----------------------------------------

-mhz		: megahertz

-hz		: Hertz (preferred)

-sec		: seconds

-ms		: milliseconds

-us		: microseconds

-ns		: nanoseconds



Distance

----------------------------------------

-mm		: millimeters



Electricity

----------------------------------------

-microamp	: micro amps

-ohms		: Ohms

-micro-ohms	: micro Ohms

-microvolt	: micro volts



Temperature

----------------------------------------

-celsius	: Degrees Celsius

-millicelsius	: Degreee milli-Celsius



Pressure

----------------------------------------

-kpascal	: kiloPascal

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ dmo Data Modul AG 
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)
@@ -247,6 +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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE