Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f64d6e2a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull DeviceTree updates from Rob Herring:

 - remove most of_platform_populate() calls in arch code.  Now the DT
   core code calls it in the default case and platforms only need to
   call it if they have special needs

 - use pr_fmt on all the DT core print statements

 - CoreSight binding doc improvements to block name descriptions

 - add dt_to_config script which can parse dts files and list
   corresponding kernel config options

 - fix memory leak hit with a PowerMac DT

 - correct a bunch of STMicro compatible strings to use the correct
   vendor prefix

 - fix DA9052 PMIC binding doc to match what is actually used in dts
   files

* tag 'devicetree-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (35 commits)
  documentation: da9052: Update regulator bindings names to match DA9052/53 DTS expectations
  xtensa: Partially Revert "xtensa: Remove unnecessary of_platform_populate with default match table"
  xtensa: Fix build error due to missing include file
  MIPS: ath79: Add missing include file
  Fix spelling errors in Documentation/devicetree
  ARM: dts: fix STMicroelectronics compatible strings
  powerpc/dts: fix STMicroelectronics compatible strings
  Documentation: dt: i2c: use correct STMicroelectronics vendor prefix
  scripts/dtc: dt_to_config - kernel config options for a devicetree
  of: fdt: mark unflattened tree as detached
  of: overlay: add resolver error prints
  coresight: document binding acronyms
  Documentation/devicetree: document cavium-pip rx-delay/tx-delay properties
  of: use pr_fmt prefix for all console printing
  of/irq: Mark initialised interrupt controllers as populated
  of: fix memory leak related to safe_name()
  Revert "of/platform: export of_default_bus_match_table"
  of: unittest: use of_platform_default_populate() to populate default bus
  memory: omap-gpmc: use of_platform_default_populate() to populate default bus
  bus: uniphier-system-bus: use of_platform_default_populate() to populate default bus
  ...
parents 1056c9bd 099c0cbd

Documentation/devicetree/bindings/arm/coresight.txt

+27 −8
Original line number Original line Diff line number Diff line
@@ -12,14 +12,33 @@ its hardware characteristcs. 




	* compatible: These have to be supplemented with "arm,primecell" as

	* compatible: These have to be supplemented with "arm,primecell" as

	  drivers are using the AMBA bus interface.  Possible values include:

	  drivers are using the AMBA bus interface.  Possible values include:

		- "arm,coresight-etb10", "arm,primecell";

		- Embedded Trace Buffer (version 1.0):

		- "arm,coresight-tpiu", "arm,primecell";

			"arm,coresight-etb10", "arm,primecell";

		- "arm,coresight-tmc", "arm,primecell";



		- "arm,coresight-funnel", "arm,primecell";

		- Trace Port Interface Unit:

		- "arm,coresight-etm3x", "arm,primecell";

			"arm,coresight-tpiu", "arm,primecell";

		- "arm,coresight-etm4x", "arm,primecell";



		- "qcom,coresight-replicator1x", "arm,primecell";

		- Trace Memory Controller, used for Embedded Trace Buffer(ETB),

		- "arm,coresight-stm", "arm,primecell"; [1]

		  Embedded Trace FIFO(ETF) and Embedded Trace Router(ETR)

		  configuration.  The configuration mode (ETB, ETF, ETR) is

		  discovered at boot time when the device is probed.

			"arm,coresight-tmc", "arm,primecell";



		- Trace Funnel:

			"arm,coresight-funnel", "arm,primecell";



		- Embedded Trace Macrocell (version 3.x) and

					Program Flow Trace Macrocell:

			"arm,coresight-etm3x", "arm,primecell";



		- Embedded Trace Macrocell (version 4.x):

			"arm,coresight-etm4x", "arm,primecell";



		- Qualcomm Configurable Replicator (version 1.x):

			"qcom,coresight-replicator1x", "arm,primecell";



		- System Trace Macrocell:

			"arm,coresight-stm", "arm,primecell"; [1]





	* reg: physical base address and length of the register

	* reg: physical base address and length of the register

	  set(s) of the component.

	  set(s) of the component.

Documentation/devicetree/bindings/arm/l2c2x0.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -86,10 +86,10 @@ Optional properties: 
  firmware)

  firmware)

- arm,dynamic-clock-gating : L2 dynamic clock gating. Value: <0> (forcibly

- arm,dynamic-clock-gating : L2 dynamic clock gating. Value: <0> (forcibly

  disable), <1> (forcibly enable), property absent (OS specific behavior,

  disable), <1> (forcibly enable), property absent (OS specific behavior,

  preferrably retain firmware settings)

  preferably retain firmware settings)

- arm,standby-mode: L2 standby mode enable. Value <0> (forcibly disable),

- arm,standby-mode: L2 standby mode enable. Value <0> (forcibly disable),

  <1> (forcibly enable), property absent (OS specific behavior,

  <1> (forcibly enable), property absent (OS specific behavior,

  preferrably retain firmware settings)

  preferably retain firmware settings)





Example:

Example:

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+4 −4
Original line number Original line Diff line number Diff line
@@ -146,10 +146,10 @@ samsung,24ad0xd1 S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power) 
sgx,vz89x		SGX Sensortech VZ89X Sensors

sgx,vz89x		SGX Sensortech VZ89X Sensors

sii,s35390a		2-wire CMOS real-time clock

sii,s35390a		2-wire CMOS real-time clock

skyworks,sky81452	Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply

skyworks,sky81452	Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply

st-micro,24c256		i2c serial eeprom  (24cxx)

st,24c256		i2c serial eeprom  (24cxx)

stm,m41t00		Serial Access TIMEKEEPER

st,m41t00		Serial real-time clock (RTC)

stm,m41t62		Serial real-time clock (RTC) with alarm

st,m41t62		Serial real-time clock (RTC) with alarm

stm,m41t80		M41T80 - SERIAL ACCESS RTC WITH ALARMS

st,m41t80		M41T80 - SERIAL ACCESS RTC WITH ALARMS

taos,tsl2550		Ambient Light Sensor with SMBUS/Two Wire Serial Interface

taos,tsl2550		Ambient Light Sensor with SMBUS/Two Wire Serial Interface

ti,ads7828		8-Channels, 12-bit ADC

ti,ads7828		8-Channels, 12-bit ADC

ti,ads7830		8-Channels, 8-bit ADC

ti,ads7830		8-Channels, 8-bit ADC

Documentation/devicetree/bindings/mfd/da9052-i2c.txt

+11 −11
Original line number Original line Diff line number Diff line
@@ -8,10 +8,13 @@ Sub-nodes: 
- regulators : Contain the regulator nodes. The DA9052/53 regulators are

- regulators : Contain the regulator nodes. The DA9052/53 regulators are

  bound using their names as listed below:

  bound using their names as listed below:





    buck0     : regulator BUCK0

    buck1     : regulator BUCK CORE

    buck1     : regulator BUCK1

    buck2     : regulator BUCK PRO

    buck2     : regulator BUCK2

    buck3     : regulator BUCK MEM

    buck3     : regulator BUCK3

    buck4     : regulator BUCK PERI

    ldo1      : regulator LDO1

    ldo2      : regulator LDO2

    ldo3      : regulator LDO3

    ldo4      : regulator LDO4

    ldo4      : regulator LDO4

    ldo5      : regulator LDO5

    ldo5      : regulator LDO5

    ldo6      : regulator LDO6

    ldo6      : regulator LDO6
@@ -19,9 +22,6 @@ Sub-nodes: 
    ldo8      : regulator LDO8

    ldo8      : regulator LDO8

    ldo9      : regulator LDO9

    ldo9      : regulator LDO9

    ldo10     : regulator LDO10

    ldo10     : regulator LDO10

    ldo11     : regulator LDO11

    ldo12     : regulator LDO12

    ldo13     : regulator LDO13





  The bindings details of individual regulator device can be found in:

  The bindings details of individual regulator device can be found in:

  Documentation/devicetree/bindings/regulator/regulator.txt

  Documentation/devicetree/bindings/regulator/regulator.txt
@@ -36,22 +36,22 @@ i2c@63fc8000 { /* I2C1 */ 
		reg = <0x48>;

		reg = <0x48>;





		regulators {

		regulators {

			buck0 {

			buck1 {

				regulator-min-microvolt = <500000>;

				regulator-min-microvolt = <500000>;

				regulator-max-microvolt = <2075000>;

				regulator-max-microvolt = <2075000>;

			};

			};





			buck1 {

			buck2 {

				regulator-min-microvolt = <500000>;

				regulator-min-microvolt = <500000>;

				regulator-max-microvolt = <2075000>;

				regulator-max-microvolt = <2075000>;

			};

			};





			buck2 {

			buck3 {

				regulator-min-microvolt = <925000>;

				regulator-min-microvolt = <925000>;

				regulator-max-microvolt = <2500000>;

				regulator-max-microvolt = <2500000>;

			};

			};





			buck3 {

			buck4 {

				regulator-min-microvolt = <925000>;

				regulator-min-microvolt = <925000>;

				regulator-max-microvolt = <2500000>;

				regulator-max-microvolt = <2500000>;

			};

			};

Documentation/devicetree/bindings/net/cavium-pip.txt

+6 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,12 @@ Properties for PIP port which is a child the PIP interface: 




- phy-handle: Optional, see ethernet.txt file in the same directory.

- phy-handle: Optional, see ethernet.txt file in the same directory.





- rx-delay: Delay value for RGMII receive clock. Optional. Disabled if 0.

  Value range is 1-31, and mapping to the actual delay varies depending on HW.



- tx-delay: Delay value for RGMII transmit clock. Optional. Disabled if 0.

  Value range is 1-31, and mapping to the actual delay varies depending on HW.



Example:

Example:





	pip@11800a0000000 {

	pip@11800a0000000 {