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

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

Pull devicetree fixes from Rob Herring:

 - Fix building DT binding examples for in tree builds

 - Correct some refcounting in adjust_local_phandle_references()

 - Update FSL FEC binding with deprecated properties

 - Schema fix in stm32 pinctrl

 - Fix typo in of_irq_parse_one docbook comment

* tag 'devicetree-fixes-for-5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of: irq: fix a trivial typo in a doc comment
  dt-bindings: pinctrl: stm32: Fix 'st,syscfg' schema
  dt-bindings: fec: explicitly mark deprecated properties
  of: resolver: Add of_node_put() before return and break
  dt-bindings: Fix generated example files getting added to schemas
parents 41de5963 83f82d7a

Documentation/devicetree/bindings/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ quiet_cmd_mk_schema = SCHEMA $@ 


DT_DOCS = $(shell \

	cd $(srctree)/$(src) && \

	find * \( -name '*.yaml' ! -name $(DT_TMP_SCHEMA) \) \

	find * \( -name '*.yaml' ! \

		-name $(DT_TMP_SCHEMA) ! \

		-name '*.example.dt.yaml' \) \

	)



DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))

Documentation/devicetree/bindings/net/fsl-fec.txt

+17 −13
Original line number Diff line number Diff line
@@ -7,18 +7,6 @@ Required properties: 
- phy-mode : See ethernet.txt file in the same directory



Optional properties:

- phy-reset-gpios : Should specify the gpio for phy reset

- phy-reset-duration : Reset duration in milliseconds.  Should present

  only if property "phy-reset-gpios" is available.  Missing the property

  will have the duration be 1 millisecond.  Numbers greater than 1000 are

  invalid and 1 millisecond will be used instead.

- phy-reset-active-high : If present then the reset sequence using the GPIO

  specified in the "phy-reset-gpios" property is reversed (H=reset state,

  L=operation state).

- phy-reset-post-delay : Post reset delay in milliseconds. If present then

  a delay of phy-reset-post-delay milliseconds will be observed after the

  phy-reset-gpios has been toggled. Can be omitted thus no delay is

  observed. Delay is in range of 1ms to 1000ms. Other delays are invalid.

- phy-supply : regulator that powers the Ethernet PHY.

- phy-handle : phandle to the PHY device connected to this device.

- fixed-link : Assume a fixed link. See fixed-link.txt in the same directory.
@@ -47,11 +35,27 @@ Optional properties: 
  For imx6sx, "int0" handles all 3 queues and ENET_MII. "pps" is for the pulse

  per second interrupt associated with 1588 precision time protocol(PTP).





Optional subnodes:

- mdio : specifies the mdio bus in the FEC, used as a container for phy nodes

  according to phy.txt in the same directory



Deprecated optional properties:

	To avoid these, create a phy node according to phy.txt in the same

	directory, and point the fec's "phy-handle" property to it. Then use

	the phy's reset binding, again described by phy.txt.

- phy-reset-gpios : Should specify the gpio for phy reset

- phy-reset-duration : Reset duration in milliseconds.  Should present

  only if property "phy-reset-gpios" is available.  Missing the property

  will have the duration be 1 millisecond.  Numbers greater than 1000 are

  invalid and 1 millisecond will be used instead.

- phy-reset-active-high : If present then the reset sequence using the GPIO

  specified in the "phy-reset-gpios" property is reversed (H=reset state,

  L=operation state).

- phy-reset-post-delay : Post reset delay in milliseconds. If present then

  a delay of phy-reset-post-delay milliseconds will be observed after the

  phy-reset-gpios has been toggled. Can be omitted thus no delay is

  observed. Delay is in range of 1ms to 1000ms. Other delays are invalid.



Example:



ethernet@83fec000 {

Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ properties: 
  hwlocks: true



  st,syscfg:

    $ref: "/schemas/types.yaml#/definitions/phandle-array"

    allOf:

      - $ref: "/schemas/types.yaml#/definitions/phandle-array"

    description: Should be phandle/offset/mask

    items:

      - description: Phandle to the syscon node which includes IRQ mux selection.

drivers/of/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ EXPORT_SYMBOL_GPL(of_irq_parse_raw); 
 * of_irq_parse_one - Resolve an interrupt for a device

 * @device: the device whose interrupt is to be resolved

 * @index: index of the interrupt to resolve

 * @out_irq: structure of_irq filled by this function

 * @out_irq: structure of_phandle_args filled by this function

 *

 * This function resolves an interrupt for a node by walking the interrupt tree,

 * finding which interrupt controller node it is attached to, and returning the

drivers/of/resolver.c

+9 −3
Original line number Diff line number Diff line
@@ -206,17 +206,23 @@ static int adjust_local_phandle_references(struct device_node *local_fixups, 
	for_each_child_of_node(local_fixups, child) {



		for_each_child_of_node(overlay, overlay_child)

			if (!node_name_cmp(child, overlay_child))

			if (!node_name_cmp(child, overlay_child)) {

				of_node_put(overlay_child);

				break;

			}



		if (!overlay_child)

		if (!overlay_child) {

			of_node_put(child);

			return -EINVAL;

		}



		err = adjust_local_phandle_references(child, overlay_child,

				phandle_delta);

		if (err)

		if (err) {

			of_node_put(child);

			return err;

		}

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE