Commit a2521822 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull devicetree fixes from Rob Herring:

 - Fix fw_devlink failure with ".*,nr-gpios" properties

 - Doc link reference fixes from Mauro

 - Fixes for unaligned FDT handling found on OpenRisc. First, avoid
   crash with better error handling when unflattening an unaligned FDT.
   Second, fix memory allocations for FDTs to ensure alignment.

* tag 'devicetree-fixes-for-5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of: property: fw_devlink: do not link ".*,nr-gpios"
  dt-bindings:iio:adc: update motorola,cpcap-adc.yaml reference
  dt-bindings: fix references for iio-bindings.txt
  dt-bindings: don't use ../dir for doc references
  of: unittest: overlay: ensure proper alignment of copied FDT
  of: properly check for error returned by fdt_get_name()
parents a85f165e d473d32c

Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ Optional node properties: 
- "#thermal-sensor-cells" Used to expose itself to thermal fw.

- "#thermal-sensor-cells" Used to expose itself to thermal fw.





Read more about iio bindings at

Read more about iio bindings at

	Documentation/devicetree/bindings/iio/iio-bindings.txt

	https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/





Example:

Example:

	ncp15wb473@0 {

	ncp15wb473@0 {

Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml

+3 −2
Original line number Original line Diff line number Diff line
@@ -14,8 +14,9 @@ description: > 
  Industrial I/O subsystem bindings for ADC controller found in

  Industrial I/O subsystem bindings for ADC controller found in

  Ingenic JZ47xx SoCs.

  Ingenic JZ47xx SoCs.





  ADC clients must use the format described in iio-bindings.txt, giving

  ADC clients must use the format described in

  a phandle and IIO specifier pair ("io-channels") to the ADC controller.

  https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml,

  giving a phandle and IIO specifier pair ("io-channels") to the ADC controller.





properties:

properties:

  compatible:

  compatible:

Documentation/devicetree/bindings/input/adc-joystick.yaml

+3 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,9 @@ properties: 
    description: >

    description: >

      List of phandle and IIO specifier pairs.

      List of phandle and IIO specifier pairs.

      Each pair defines one ADC channel to which a joystick axis is connected.

      Each pair defines one ADC channel to which a joystick axis is connected.

      See Documentation/devicetree/bindings/iio/iio-bindings.txt for details.

      See

      https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml

      for details.





  '#address-cells':

  '#address-cells':

    const: 1

    const: 1

Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.txt

+4 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,10 @@ Required properties: 
 - compatible: must be "resistive-adc-touch"

 - compatible: must be "resistive-adc-touch"

The device must be connected to an ADC device that provides channels for

The device must be connected to an ADC device that provides channels for

position measurement and optional pressure.

position measurement and optional pressure.

Refer to ../iio/iio-bindings.txt for details

Refer to

https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml

for details



 - iio-channels: must have at least two channels connected to an ADC device.

 - iio-channels: must have at least two channels connected to an ADC device.

These should correspond to the channels exposed by the ADC device and should

These should correspond to the channels exposed by the ADC device and should

have the right index as the ADC device registers them. These channels

have the right index as the ADC device registers them. These channels

Documentation/devicetree/bindings/mfd/ab8500.txt

+3 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,9 @@ Required child device properties: 
                                               pwm|regulator|rtc|sysctrl|usb]";

                                               pwm|regulator|rtc|sysctrl|usb]";





  A few child devices require ADC channels from the GPADC node. Those follow the

  A few child devices require ADC channels from the GPADC node. Those follow the

  standard bindings from iio/iio-bindings.txt and iio/adc/adc.txt

  standard bindings from

  https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml

  and Documentation/devicetree/bindings/iio/adc/adc.yaml





  abx500-temp		 : io-channels "aux1" and "aux2" for measuring external

  abx500-temp		 : io-channels "aux1" and "aux2" for measuring external

			   temperatures.

			   temperatures.