Loading Documentation/devicetree/bindings/Makefile +3 −1 Original line number Original line Diff line number Diff line Loading @@ -19,7 +19,9 @@ quiet_cmd_mk_schema = SCHEMA $@ DT_DOCS = $(shell \ DT_DOCS = $(shell \ cd $(srctree)/$(src) && \ 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)) DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS)) Loading Documentation/devicetree/bindings/net/fsl-fec.txt +17 −13 Original line number Original line Diff line number Diff line Loading @@ -7,18 +7,6 @@ Required properties: - phy-mode : See ethernet.txt file in the same directory - phy-mode : See ethernet.txt file in the same directory Optional properties: 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-supply : regulator that powers the Ethernet PHY. - phy-handle : phandle to the PHY device connected to this device. - 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. - fixed-link : Assume a fixed link. See fixed-link.txt in the same directory. Loading Loading @@ -47,11 +35,27 @@ Optional properties: For imx6sx, "int0" handles all 3 queues and ENET_MII. "pps" is for the pulse 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). per second interrupt associated with 1588 precision time protocol(PTP). Optional subnodes: Optional subnodes: - mdio : specifies the mdio bus in the FEC, used as a container for phy nodes - mdio : specifies the mdio bus in the FEC, used as a container for phy nodes according to phy.txt in the same directory 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: Example: ethernet@83fec000 { ethernet@83fec000 { Loading Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml +2 −1 Original line number Original line Diff line number Diff line Loading @@ -37,7 +37,8 @@ properties: hwlocks: true hwlocks: true st,syscfg: st,syscfg: $ref: "/schemas/types.yaml#/definitions/phandle-array" allOf: - $ref: "/schemas/types.yaml#/definitions/phandle-array" description: Should be phandle/offset/mask description: Should be phandle/offset/mask items: items: - description: Phandle to the syscon node which includes IRQ mux selection. - description: Phandle to the syscon node which includes IRQ mux selection. Loading drivers/of/irq.c +1 −1 Original line number Original line Diff line number Diff line Loading @@ -277,7 +277,7 @@ EXPORT_SYMBOL_GPL(of_irq_parse_raw); * of_irq_parse_one - Resolve an interrupt for a device * of_irq_parse_one - Resolve an interrupt for a device * @device: the device whose interrupt is to be resolved * @device: the device whose interrupt is to be resolved * @index: index of the interrupt to resolve * @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, * 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 * finding which interrupt controller node it is attached to, and returning the Loading drivers/of/resolver.c +9 −3 Original line number Original line Diff line number Diff line Loading @@ -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(local_fixups, child) { for_each_child_of_node(overlay, overlay_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; break; } if (!overlay_child) if (!overlay_child) { of_node_put(child); return -EINVAL; return -EINVAL; } err = adjust_local_phandle_references(child, overlay_child, err = adjust_local_phandle_references(child, overlay_child, phandle_delta); phandle_delta); if (err) if (err) { of_node_put(child); return err; return err; } } } return 0; return 0; } } Loading Loading
Documentation/devicetree/bindings/Makefile +3 −1 Original line number Original line Diff line number Diff line Loading @@ -19,7 +19,9 @@ quiet_cmd_mk_schema = SCHEMA $@ DT_DOCS = $(shell \ DT_DOCS = $(shell \ cd $(srctree)/$(src) && \ 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)) DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS)) Loading
Documentation/devicetree/bindings/net/fsl-fec.txt +17 −13 Original line number Original line Diff line number Diff line Loading @@ -7,18 +7,6 @@ Required properties: - phy-mode : See ethernet.txt file in the same directory - phy-mode : See ethernet.txt file in the same directory Optional properties: 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-supply : regulator that powers the Ethernet PHY. - phy-handle : phandle to the PHY device connected to this device. - 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. - fixed-link : Assume a fixed link. See fixed-link.txt in the same directory. Loading Loading @@ -47,11 +35,27 @@ Optional properties: For imx6sx, "int0" handles all 3 queues and ENET_MII. "pps" is for the pulse 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). per second interrupt associated with 1588 precision time protocol(PTP). Optional subnodes: Optional subnodes: - mdio : specifies the mdio bus in the FEC, used as a container for phy nodes - mdio : specifies the mdio bus in the FEC, used as a container for phy nodes according to phy.txt in the same directory 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: Example: ethernet@83fec000 { ethernet@83fec000 { Loading
Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml +2 −1 Original line number Original line Diff line number Diff line Loading @@ -37,7 +37,8 @@ properties: hwlocks: true hwlocks: true st,syscfg: st,syscfg: $ref: "/schemas/types.yaml#/definitions/phandle-array" allOf: - $ref: "/schemas/types.yaml#/definitions/phandle-array" description: Should be phandle/offset/mask description: Should be phandle/offset/mask items: items: - description: Phandle to the syscon node which includes IRQ mux selection. - description: Phandle to the syscon node which includes IRQ mux selection. Loading
drivers/of/irq.c +1 −1 Original line number Original line Diff line number Diff line Loading @@ -277,7 +277,7 @@ EXPORT_SYMBOL_GPL(of_irq_parse_raw); * of_irq_parse_one - Resolve an interrupt for a device * of_irq_parse_one - Resolve an interrupt for a device * @device: the device whose interrupt is to be resolved * @device: the device whose interrupt is to be resolved * @index: index of the interrupt to resolve * @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, * 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 * finding which interrupt controller node it is attached to, and returning the Loading
drivers/of/resolver.c +9 −3 Original line number Original line Diff line number Diff line Loading @@ -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(local_fixups, child) { for_each_child_of_node(overlay, overlay_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; break; } if (!overlay_child) if (!overlay_child) { of_node_put(child); return -EINVAL; return -EINVAL; } err = adjust_local_phandle_references(child, overlay_child, err = adjust_local_phandle_references(child, overlay_child, phandle_delta); phandle_delta); if (err) if (err) { of_node_put(child); return err; return err; } } } return 0; return 0; } } Loading
