Commit d471c4df authored by Linus Torvalds's avatar Linus Torvalds

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

Pull Devicetree fixes from Rob Herring:

 - Remove now unused struct device_node.type pointer

 - Fix meson-axg reset header SPDX tag

 - Add missing of_node_put in of_graph_get_remote_port_parent

 - Fix several binding doc file references and typos

* tag 'devicetree-fixes-for-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: reset: meson-axg: fix SPDX license id
  dt-bindings: soc: qcom: Fix trivial language typos
  doc: gpio-mvebu: fix broken reference to cp110-system-controller0.txt file
  OF: properties: add missing of_node_put
  doc: bindings: fix bad reference to ARM CPU bindings
  dt-bindings: marvell,mmp2: fix typos in bindings doc
  of: Remove struct device_node.type pointer
parents 7fbfee7c 3705add0
...@@ -235,4 +235,4 @@ cpus { ...@@ -235,4 +235,4 @@ cpus {
=========================================== ===========================================
[1] ARM Linux Kernel documentation - CPUs bindings [1] ARM Linux Kernel documentation - CPUs bindings
Documentation/devicetree/bindings/arm/cpus.txt Documentation/devicetree/bindings/arm/cpus.yaml
...@@ -684,7 +684,7 @@ cpus { ...@@ -684,7 +684,7 @@ cpus {
=========================================== ===========================================
[1] ARM Linux Kernel documentation - CPUs bindings [1] ARM Linux Kernel documentation - CPUs bindings
Documentation/devicetree/bindings/arm/cpus.txt Documentation/devicetree/bindings/arm/cpus.yaml
[2] ARM Linux Kernel documentation - PSCI bindings [2] ARM Linux Kernel documentation - PSCI bindings
Documentation/devicetree/bindings/arm/psci.txt Documentation/devicetree/bindings/arm/psci.txt
......
...@@ -4,7 +4,7 @@ SP810 System Controller ...@@ -4,7 +4,7 @@ SP810 System Controller
Required properties: Required properties:
- compatible: standard compatible string for a Primecell peripheral, - compatible: standard compatible string for a Primecell peripheral,
see Documentation/devicetree/bindings/arm/primecell.txt see Documentation/devicetree/bindings/arm/primecell.yaml
for more details for more details
should be: "arm,sp810", "arm,primecell" should be: "arm,sp810", "arm,primecell"
......
...@@ -472,4 +472,4 @@ cpus { ...@@ -472,4 +472,4 @@ cpus {
=============================================================================== ===============================================================================
[1] ARM Linux kernel documentation [1] ARM Linux kernel documentation
Documentation/devicetree/bindings/arm/cpus.txt Documentation/devicetree/bindings/arm/cpus.yaml
...@@ -18,4 +18,4 @@ Required Properties: ...@@ -18,4 +18,4 @@ Required Properties:
Each clock is assigned an identifier and client nodes use this identifier Each clock is assigned an identifier and client nodes use this identifier
to specify the clock which they consume. to specify the clock which they consume.
All these identifier could be found in <dt-bindings/clock/marvell-mmp2.h>. All these identifiers could be found in <dt-bindings/clock/marvell,mmp2.h>.
* ARM PrimeCell Color LCD Controller PL110/PL111 * ARM PrimeCell Color LCD Controller PL110/PL111
See also Documentation/devicetree/bindings/arm/primecell.txt See also Documentation/devicetree/bindings/arm/primecell.yaml
Required properties: Required properties:
......
...@@ -14,8 +14,6 @@ Required properties: ...@@ -14,8 +14,6 @@ Required properties:
"marvell,armada-8k-gpio" should be used for the Armada 7K and 8K "marvell,armada-8k-gpio" should be used for the Armada 7K and 8K
SoCs (either from AP or CP), see SoCs (either from AP or CP), see
Documentation/devicetree/bindings/arm/marvell/cp110-system-controller0.txt
and
Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt
for specific details about the offset property. for specific details about the offset property.
......
...@@ -78,7 +78,7 @@ Sub-nodes: ...@@ -78,7 +78,7 @@ Sub-nodes:
PPI affinity can be expressed as a single "ppi-partitions" node, PPI affinity can be expressed as a single "ppi-partitions" node,
containing a set of sub-nodes, each with the following property: containing a set of sub-nodes, each with the following property:
- affinity: Should be a list of phandles to CPU nodes (as described in - affinity: Should be a list of phandles to CPU nodes (as described in
Documentation/devicetree/bindings/arm/cpus.txt). Documentation/devicetree/bindings/arm/cpus.yaml).
GICv3 has one or more Interrupt Translation Services (ITS) that are GICv3 has one or more Interrupt Translation Services (ITS) that are
used to route Message Signalled Interrupts (MSI) to the CPUs. used to route Message Signalled Interrupts (MSI) to the CPUs.
......
...@@ -55,7 +55,7 @@ of these nodes are defined by the individual bindings for the specific function ...@@ -55,7 +55,7 @@ of these nodes are defined by the individual bindings for the specific function
= EXAMPLE = EXAMPLE
The following example represents the GLINK RPM node on a MSM8996 device, with The following example represents the GLINK RPM node on a MSM8996 device, with
the function for the "rpm_request" channel defined, which is used for the function for the "rpm_request" channel defined, which is used for
regualtors and root clocks. regulators and root clocks.
apcs_glb: mailbox@9820000 { apcs_glb: mailbox@9820000 {
compatible = "qcom,msm8996-apcs-hmss-global"; compatible = "qcom,msm8996-apcs-hmss-global";
......
...@@ -41,12 +41,12 @@ processor ID) and a string identifier. ...@@ -41,12 +41,12 @@ processor ID) and a string identifier.
- qcom,local-pid: - qcom,local-pid:
Usage: required Usage: required
Value type: <u32> Value type: <u32>
Definition: specifies the identfier of the local endpoint of this edge Definition: specifies the identifier of the local endpoint of this edge
- qcom,remote-pid: - qcom,remote-pid:
Usage: required Usage: required
Value type: <u32> Value type: <u32>
Definition: specifies the identfier of the remote endpoint of this edge Definition: specifies the identifier of the remote endpoint of this edge
= SUBNODES = SUBNODES
Each SMP2P pair contain a set of inbound and outbound entries, these are Each SMP2P pair contain a set of inbound and outbound entries, these are
......
...@@ -207,11 +207,8 @@ static void __of_attach_node(struct device_node *np) ...@@ -207,11 +207,8 @@ static void __of_attach_node(struct device_node *np)
if (!of_node_check_flag(np, OF_OVERLAY)) { if (!of_node_check_flag(np, OF_OVERLAY)) {
np->name = __of_get_property(np, "name", NULL); np->name = __of_get_property(np, "name", NULL);
np->type = __of_get_property(np, "device_type", NULL);
if (!np->name) if (!np->name)
np->name = "<NULL>"; np->name = "<NULL>";
if (!np->type)
np->type = "<NULL>";
phandle = __of_get_property(np, "phandle", &sz); phandle = __of_get_property(np, "phandle", &sz);
if (!phandle) if (!phandle)
......
...@@ -314,12 +314,8 @@ static bool populate_node(const void *blob, ...@@ -314,12 +314,8 @@ static bool populate_node(const void *blob,
populate_properties(blob, offset, mem, np, pathp, dryrun); populate_properties(blob, offset, mem, np, pathp, dryrun);
if (!dryrun) { if (!dryrun) {
np->name = of_get_property(np, "name", NULL); np->name = of_get_property(np, "name", NULL);
np->type = of_get_property(np, "device_type", NULL);
if (!np->name) if (!np->name)
np->name = "<NULL>"; np->name = "<NULL>";
if (!np->type)
np->type = "<NULL>";
} }
*pnp = np; *pnp = np;
......
...@@ -423,12 +423,9 @@ static int add_changeset_node(struct overlay_changeset *ovcs, ...@@ -423,12 +423,9 @@ static int add_changeset_node(struct overlay_changeset *ovcs,
tchild->parent = target->np; tchild->parent = target->np;
tchild->name = __of_get_property(node, "name", NULL); tchild->name = __of_get_property(node, "name", NULL);
tchild->type = __of_get_property(node, "device_type", NULL);
if (!tchild->name) if (!tchild->name)
tchild->name = "<NULL>"; tchild->name = "<NULL>";
if (!tchild->type)
tchild->type = "<NULL>";
/* ignore obsolete "linux,phandle" */ /* ignore obsolete "linux,phandle" */
phandle = __of_get_property(node, "phandle", &size); phandle = __of_get_property(node, "phandle", &size);
......
...@@ -155,7 +155,6 @@ static struct device_node * __init of_pdt_create_node(phandle node, ...@@ -155,7 +155,6 @@ static struct device_node * __init of_pdt_create_node(phandle node,
dp->parent = parent; dp->parent = parent;
dp->name = of_pdt_get_one_property(node, "name"); dp->name = of_pdt_get_one_property(node, "name");
dp->type = of_pdt_get_one_property(node, "device_type");
dp->phandle = node; dp->phandle = node;
dp->properties = of_pdt_build_prop_list(node); dp->properties = of_pdt_build_prop_list(node);
......
...@@ -806,6 +806,7 @@ struct device_node *of_graph_get_remote_node(const struct device_node *node, ...@@ -806,6 +806,7 @@ struct device_node *of_graph_get_remote_node(const struct device_node *node,
if (!of_device_is_available(remote)) { if (!of_device_is_available(remote)) {
pr_debug("not available for remote node\n"); pr_debug("not available for remote node\n");
of_node_put(remote);
return NULL; return NULL;
} }
......
/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
/* /*
*
* Copyright (c) 2016 BayLibre, SAS. * Copyright (c) 2016 BayLibre, SAS.
* Author: Neil Armstrong <narmstrong@baylibre.com> * Author: Neil Armstrong <narmstrong@baylibre.com>
* *
* Copyright (c) 2017 Amlogic, inc. * Copyright (c) 2017 Amlogic, inc.
* Author: Yixun Lan <yixun.lan@amlogic.com> * Author: Yixun Lan <yixun.lan@amlogic.com>
* *
* SPDX-License-Identifier: (GPL-2.0+ OR BSD)
*/ */
#ifndef _DT_BINDINGS_AMLOGIC_MESON_AXG_RESET_H #ifndef _DT_BINDINGS_AMLOGIC_MESON_AXG_RESET_H
......
...@@ -50,7 +50,6 @@ struct of_irq_controller; ...@@ -50,7 +50,6 @@ struct of_irq_controller;
struct device_node { struct device_node {
const char *name; const char *name;
const char *type;
phandle phandle; phandle phandle;
const char *full_name; const char *full_name;
struct fwnode_handle fwnode; struct fwnode_handle fwnode;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment