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

Commit 78d9b048 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-4.15-part2' of... 

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

Pull DeviceTree fixes from Rob Herring:
 "Another set of DT fixes:

   - Fixes from overlay code rework. A trifecta of fixes to the locking,
     an out of bounds access, and a memory leak in of_overlay_apply()

   - Clean-up at25 eeprom binding document

   - Remove leading '0x' in unit-addresses from binding docs"

* tag 'devicetree-fixes-for-4.15-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of: overlay: Make node skipping in init_overlay_changeset() clearer
  of: overlay: Fix out-of-bounds write in init_overlay_changeset()
  of: overlay: Fix (un)locking in of_overlay_apply()
  of: overlay: Fix memory leak in of_overlay_apply() error path
  dt-bindings: eeprom: at25: Document device-specific compatible values
  dt-bindings: eeprom: at25: Grammar s/are can/can/
  dt-bindings: Remove leading 0x from bindings notation
  of: overlay: Remove else after goto
  of: Spelling s/changset/changeset/
  of: unittest: Remove bogus overlay mutex release from overlay_data_add()
parents 900add27 589b754d

Documentation/devicetree/bindings/arm/ccn.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Required properties: 


Example:



	ccn@0x2000000000 {

	ccn@2000000000 {

		compatible = "arm,ccn-504";

		reg = <0x20 0x00000000 0 0x1000000>;

		interrupts = <0 181 4>;

Documentation/devicetree/bindings/arm/omap/crossbar.txt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ An interrupt consumer on an SoC using crossbar will use: 
	interrupts = <GIC_SPI request_number interrupt_level>



Example:

	device_x@0x4a023000 {

	device_x@4a023000 {

		/* Crossbar 8 used */

		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

		...

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Required properties: 
- interrupts : Should contain MC General interrupt.



Example:

	memory-controller@0x7000f000 {

	memory-controller@7000f000 {

		compatible = "nvidia,tegra20-mc";

		reg = <0x7000f000 0x024

		       0x7000f03c 0x3c4>;

Documentation/devicetree/bindings/clock/axi-clkgen.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Optional properties: 
- clock-output-names : From common clock binding.



Example:

	clock@0xff000000 {

	clock@ff000000 {

		compatible = "adi,axi-clkgen";

		#clock-cells = <0>;

		reg = <0xff000000 0x1000>;

Documentation/devicetree/bindings/clock/brcm,bcm2835-aux-clock.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ Example: 
		clocks = <&clk_osc>;

	};



	aux: aux@0x7e215004 {

	aux: aux@7e215004 {

		compatible = "brcm,bcm2835-aux";

		#clock-cells = <1>;

		reg = <0x7e215000 0x8>;