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

Commit 05df2045 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull DeviceTree fixes from Rob Herring:

 - Fix phandle cache to work with overlays

 - Correct the default clock-frequency for QCom geni-i2c

 - Binding doc quote and spelling fixes

* tag 'devicetree-fixes-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of: overlay: update phandle cache on overlay apply and remove
  dt-bindings: Fix unbalanced quotation marks
  dt-bindings: soc: qcom: Fix default clock-freq for qcom,geni-i2c
  dt-bindings: w1-gpio: Remove unneeded unit address
  Documentation: devicetree: tilcdc: fix spelling mistake "suppors" -> "supports"
parents 04a13206 b9952b52

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

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ Required root node properties: 
	- "insignal,arndale-octa" - for Exynos5420-based Insignal Arndale

				    Octa board.

	- "insignal,origen"       - for Exynos4210-based Insignal Origen board.

	- "insignal,origen4412    - for Exynos4412-based Insignal Origen board.

	- "insignal,origen4412"   - for Exynos4412-based Insignal Origen board.





Optional nodes:

Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ Optional nodes: 


 - port/ports: to describe a connection to an external encoder. The

   binding follows Documentation/devicetree/bindings/graph.txt and

   suppors a single port with a single endpoint.

   supports a single port with a single endpoint.



 - See also Documentation/devicetree/bindings/display/tilcdc/panel.txt and

   Documentation/devicetree/bindings/display/tilcdc/tfp410.txt for connecting

Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt

+1 −1
Original line number Diff line number Diff line 
Nintendo Wii (Hollywood) GPIO controller



Required properties:

- compatible: "nintendo,hollywood-gpio

- compatible: "nintendo,hollywood-gpio"

- reg: Physical base address and length of the controller's registers.

- gpio-controller: Marks the device node as a GPIO controller.

- #gpio-cells: Should be <2>. The first cell is the pin number and the

Documentation/devicetree/bindings/input/touchscreen/hideep.txt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ i2c@00000000 { 
		reg = <0x6c>;

		interrupt-parent = <&gpx1>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;

		vdd-supply = <&ldo15_reg>";

		vdd-supply = <&ldo15_reg>;

		vid-supply = <&ldo18_reg>;

		reset-gpios = <&gpx1 5 0>;

		touchscreen-size-x = <1080>;

Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra20-ictlr.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Required properties: 
  include "nvidia,tegra30-ictlr".	

- reg : Specifies base physical address and size of the registers.

  Each controller must be described separately (Tegra20 has 4 of them,

  whereas Tegra30 and later have 5"  

  whereas Tegra30 and later have 5).

- interrupt-controller : Identifies the node as an interrupt controller.

- #interrupt-cells : Specifies the number of cells needed to encode an

  interrupt source. The value must be 3.