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

Commit 82efe439 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Devicetree updates from Rob Herring:

 - Fix possible memory leak in reserved-memory failure case

 - Support for DMA parent bus which are not a parent node

 - Clang -Wunsequenced fix

 - Remove some unnecessary prints on memory alloc failures

 - Various printk msg and comment fixes

 - Update DT schema tools repository location

 - Convert simple-framebuffer binding to DT schema

 - Bindings for isl68137 and ir38064 trivial devices

 - New documentation on binding do's and don't's for binding writers to
   ignore

* tag 'devicetree-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (22 commits)
  of: unittest: Remove error printing on OOM
  of: irq: Remove WARN_ON() for kzalloc() failure
  dt-bindings: pinctrl: fix bias-pull,up typo
  dt-bindings: Update schema project location to devicetree.org github group
  of: fix clang -Wunsequenced for be32_to_cpu()
  of/device.c: fix the wrong comments
  dt-bindings: Add isl68137 as a trivial device
  dt-bindings: Add ir38064 as a trivial device
  of: del redundant type conversion
  dt-bindings: mfd: axp20x: Add fallback for axp805
  of: Improve of_phandle_iterator_next() error message
  dt-bindings: connector: Spelling mistake
  dt-bindings: Add schemas for simple-framebuffer
  of: address: Add support for the parent DMA bus
  of: address: Retrieve a parent through a callback in __of_translate_address
  dt-bindings: bus: Add binding for the Allwinner MBUS controller
  dt-bindings: interconnect: Add a dma interconnect name
  of: use correct function prototype for of_overlay_fdt_apply()
  of: reserved_mem: fix reserve memory leak
  of: property: Document that of_graph_get_endpoint_by_regs needs of_node_put
  ...
parents dd5001e2 2a656cb5

Documentation/devicetree/bindings/arm/cpus.yaml

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ properties: 


patternProperties:

  '^cpu@[0-9a-f]+$':

    type: object

    properties:

      device_type:

        const: cpu

Documentation/devicetree/bindings/arm/sunxi/sunxi-mbus.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
Allwinner Memory Bus (MBUS) controller



The MBUS controller drives the MBUS that other devices in the SoC will

use to perform DMA. It also has a register interface that allows to

monitor and control the bandwidth and priorities for masters on that

bus.



Required properties:

 - compatible: Must be one of:

	- allwinner,sun5i-a13-mbus

 - reg: Offset and length of the register set for the controller

 - clocks: phandle to the clock driving the controller

 - dma-ranges: See section 2.3.9 of the DeviceTree Specification

 - #interconnect-cells: Must be one, with the argument being the MBUS

   port ID



Each device having to perform their DMA through the MBUS must have the

interconnects and interconnect-names properties set to the MBUS

controller and with "dma-mem" as the interconnect name.



Example:



mbus: dram-controller@1c01000 {

	compatible = "allwinner,sun5i-a13-mbus";

	reg = <0x01c01000 0x1000>;

	clocks = <&ccu CLK_MBUS>;

	dma-ranges = <0x00000000 0x40000000 0x20000000>;

	#interconnect-cells = <1>;

};



fe0: display-frontend@1e00000 {

	compatible = "allwinner,sun5i-a13-display-frontend";

	...

	interconnects = <&mbus 19>;

	interconnect-names = "dma-mem";

};

Documentation/devicetree/bindings/connector/usb-connector.txt

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ Required properties for usb-c-connector with power delivery support: 
Required nodes:

- any data bus to the connector should be modeled using the OF graph bindings

  specified in bindings/graph.txt, unless the bus is between parent node and

  the connector. Since single connector can have multpile data buses every bus

  the connector. Since single connector can have multiple data buses every bus

  has assigned OF graph port number as follows:

    0: High Speed (HS), present in all connectors,

    1: Super Speed (SS), present in SS capable connectors,

Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
Meson specific Simple Framebuffer bindings



This binding documents meson specific extensions to the simple-framebuffer

bindings. The meson simplefb u-boot code relies on the devicetree containing

pre-populated simplefb nodes.



These extensions are intended so that u-boot can select the right node based

on which pipeline is being used. As such they are solely intended for

firmware / bootloader use, and the OS should ignore them.



Required properties:

- compatible: "amlogic,simple-framebuffer", "simple-framebuffer"

- amlogic,pipeline, one of:

  "vpu-cvbs"

  "vpu-hdmi"



Example:



chosen {

	#address-cells = <2>;

	#size-cells = <2>;

	ranges;



	simplefb_hdmi: framebuffer-hdmi {

		compatible = "amlogic,simple-framebuffer",

			     "simple-framebuffer";

		amlogic,pipeline = "vpu-hdmi";

		clocks = <&clkc CLKID_HDMI_PCLK>,

			 <&clkc CLKID_CLK81>,

			 <&clkc CLKID_GCLK_VENCI_INT0>;

		power-domains = <&pwrc_vpu>;

	};

};

Documentation/devicetree/bindings/display/simple-framebuffer-sunxi.txt

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
Sunxi specific Simple Framebuffer bindings



This binding documents sunxi specific extensions to the simple-framebuffer

bindings. The sunxi simplefb u-boot code relies on the devicetree containing

pre-populated simplefb nodes.



These extensions are intended so that u-boot can select the right node based

on which pipeline is being used. As such they are solely intended for

firmware / bootloader use, and the OS should ignore them.



Required properties:

- compatible: "allwinner,simple-framebuffer"

- allwinner,pipeline, one of:

  "de_be0-lcd0"

  "de_be1-lcd1"

  "de_be0-lcd0-hdmi"

  "de_be1-lcd1-hdmi"

  "mixer0-lcd0"

  "mixer0-lcd0-hdmi"

  "mixer1-lcd1-hdmi"

  "mixer1-lcd1-tve"



Example:



chosen {

	#address-cells = <1>;

	#size-cells = <1>;

	ranges;



	framebuffer@0 {

		compatible = "allwinner,simple-framebuffer", "simple-framebuffer";

		allwinner,pipeline = "de_be0-lcd0-hdmi";

		clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,

			 <&ahb_gates 44>;

	};

};