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

Commit 2bed2660 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull DeviceTree updates from Rob Herring:

 - Convert to use memblock_virt_alloc in DT code which supports
   bootmem arches. With this we can remove the arch specific
   early_init_dt_alloc_memory_arch() functions.

 - Enable running the DT unittests on UML

 - Use SPDX license tags on DT files

 - Fix early FDT kconfig ifdef logic

 - Clean-up unittest Makefile

 - Fix function comment for of_irq_parse_raw

 - Add missing documentation for linux,initrd-{start,end} properties

 - Clean-up of binding examples using uppercase hex

 - Add trivial devices W83773G and Infineon TLV493D-A1B6

 - Add missing STM32 SoC bindings

 - Various small binding doc fixes

* tag 'devicetree-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (23 commits)
  xtensa: remove arch specific early DT functions
  x86: remove arch specific early_init_dt_alloc_memory_arch
  nios2: remove arch specific early_init_dt_alloc_memory_arch
  mips: remove arch specific early_init_dt_alloc_memory_arch
  metag: remove arch specific early DT functions
  cris: remove arch specific early DT functions
  libfdt: remove unnecessary include directive from <linux/libfdt.h>
  of: unittest: refactor Makefile
  of/fdt: use memblock_virt_alloc for early alloc
  of: Use SPDX license tag for DT files
  of/fdt: Fix #ifdef dependency of early flattree declarations
  dt-bindings: h8300 clocksource: correct spelling of pulse
  dt-bindings: imx6q-pcie: Add required property for i.MX6SX
  mmc: Don't reference Linux-specific OF_GPIO_ACTIVE_LOW flag in DT binding
  dt-bindings: Use lower case hex in unit-addresses
  dt-bindings: display: panel: Fix compatible string for Toshiba LT089AC29000
  dt-bindings: Add Infineon TLV493D-A1B6
  dt-bindings: mailbox: ti,message-manager: Fix interrupt name error
  dt-bindings: chosen: Document linux,initrd-{start,end}
  dt-bindings: arm: document supported STM32 SoC family
  ...
parents eea43ed8 3a6fbcb2

Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ Note: child nodes can be added for auto probing from device tree. 


Example: adding device info in dtsi file



adc: adc@12D10000 {

adc: adc@12d10000 {

	compatible = "samsung,exynos-adc-v1";

	reg = <0x12D10000 0x100>;

	interrupts = <0 106 0>;
@@ -71,7 +71,7 @@ adc: adc@12D10000 { 


Example: adding device info in dtsi file for Exynos3250 with additional sclk



adc: adc@126C0000 {

adc: adc@126c0000 {

	compatible = "samsung,exynos3250-adc", "samsung,exynos-adc-v2;

	reg = <0x126C0000 0x100>;

	interrupts = <0 137 0>;
@@ -87,7 +87,7 @@ adc: adc@126C0000 { 


Example: Adding child nodes in dts file



adc@12D10000 {

adc@12d10000 {



	/* NTC thermistor is a hwmon device */

	ncp15wb473@0 {

Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ Optional nodes: 
        - compatible: only "samsung,secure-firmware" is currently supported

        - reg: address of non-secure SYSRAM used for communication with firmware



	firmware@203F000 {

	firmware@203f000 {

		compatible = "samsung,secure-firmware";

		reg = <0x0203F000 0x1000>;

	};

Documentation/devicetree/bindings/arm/stm32.txt

0 → 100644
+9 −0
Original line number Diff line number Diff line 
STMicroelectronics STM32 Platforms Device Tree Bindings



Each device tree must specify which STM32 SoC it uses,

using one of the following compatible strings:



  st,stm32f429

  st,stm32f469

  st,stm32f746

  st,stm32h743

Documentation/devicetree/bindings/chosen.txt

+15 −0
Original line number Diff line number Diff line
@@ -120,3 +120,18 @@ e.g. 
While this property does not represent a real hardware, the address

and the size are expressed in #address-cells and #size-cells,

respectively, of the root node.



linux,initrd-start and linux,initrd-end

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



These properties hold the physical start and end address of an initrd that's

loaded by the bootloader. Note that linux,initrd-start is inclusive, but

linux,initrd-end is exclusive.

e.g.



/ {

	chosen {

		linux,initrd-start = <0x82000000>;

		linux,initrd-end = <0x82800000>;

	};

};

Documentation/devicetree/bindings/clock/exynos3250-clock.txt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Example 1: Examples of clock controller nodes are listed below. 
		#clock-cells = <1>;

	};



	cmu_dmc: clock-controller@105C0000 {

	cmu_dmc: clock-controller@105c0000 {

		compatible = "samsung,exynos3250-cmu-dmc";

		reg = <0x105C0000 0x2000>;

		#clock-cells = <1>;