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

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

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

Pull devicetree fixes from Rob Herring:
 "DeviceTree fixes for 3.18:

   - two fixes for OF selftest code
   - fix for PowerPC address parsing to disable work-around except on
     old PowerMACs
   - fix a crash when earlycon is enabled, but no device is found
   - DT documentation fixes and missing vendor prefixes

  All but the doc updates are also for stable"

* tag 'devicetree-fixes-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of/selftest: Fix testing when /aliases is missing
  of/selftest: Fix off-by-one error in removal path
  documentation: pinctrl bindings: Fix trivial typo 'abitrary'
  devicetree: bindings: Add vendor prefix for Micron Technology, Inc.
  of: Add vendor prefix for Chips&Media, Inc.
  of/base: Fix PowerPC address parsing hack
  devicetree: vendor-prefixes.txt: fix whitespace
  of: Fix crash if an earlycon driver is not found
  of/irq: Drop obsolete 'interrupts' vs 'interrupts-extended' text
  of: Spelling s/stucture/structure/
  devicetree: bindings: add sandisk to the vendor prefixes
parents 08685897 788ec2fc

Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

+0 −4
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ should only be used when a device has multiple interrupt parents. 
  Example:

	interrupts-extended = <&intc1 5 1>, <&intc2 1 0>;



A device node may contain either "interrupts" or "interrupts-extended", but not

both. If both properties are present, then the operating system should log an

error and use only the data in "interrupts".



2) Interrupt controller nodes

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

Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the 
common pinctrl bindings used by client devices, including the meaning of the

phrase "pin configuration node".



TZ1090-PDC's pin configuration nodes act as a container for an abitrary number

TZ1090-PDC's pin configuration nodes act as a container for an arbitrary number

of subnodes. Each of these subnodes represents some desired configuration for a

pin, a group, or a list of pins or groups. This configuration can include the

mux function to select on those pin(s)/group(s), and various pin configuration

Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the 
common pinctrl bindings used by client devices, including the meaning of the

phrase "pin configuration node".



TZ1090's pin configuration nodes act as a container for an abitrary number of

TZ1090's pin configuration nodes act as a container for an arbitrary number of

subnodes. Each of these subnodes represents some desired configuration for a

pin, a group, or a list of pins or groups. This configuration can include the

mux function to select on those pin(s)/group(s), and various pin configuration

Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the 
common pinctrl bindings used by client devices, including the meaning of the

phrase "pin configuration node".



Lantiq's pin configuration nodes act as a container for an abitrary number of

Lantiq's pin configuration nodes act as a container for an arbitrary number of

subnodes. Each of these subnodes represents some desired configuration for a

pin, a group, or a list of pins or groups. This configuration can include the

mux function to select on those group(s), and two pin configuration parameters:

Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the 
common pinctrl bindings used by client devices, including the meaning of the

phrase "pin configuration node".



Lantiq's pin configuration nodes act as a container for an abitrary number of

Lantiq's pin configuration nodes act as a container for an arbitrary number of

subnodes. Each of these subnodes represents some desired configuration for a

pin, a group, or a list of pins or groups. This configuration can include the

mux function to select on those group(s), and two pin configuration parameters: