Commit d6af6330 authored by Linus Torvalds's avatar Linus Torvalds

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

Pull devicetree fixes from Rob Herring:
 "Another set of DT fixes:

   - restore range parsing error check

   - workaround PCI range parsing with missing 'device_type' now
     required

   - correct description of 'phy-connection-type'

   - fix erroneous matching on 'snps,dw-pcie' by 'intel,lgm-pcie' schema

   - a couple of grammar and whitespace fixes

   - update Shawn Guo's email"

* tag 'devicetree-fixes-for-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: vendor-prefixes: Remove trailing whitespace
  dt-bindings: net: correct description of phy-connection-type
  dt-bindings: PCI: intel,lgm-pcie: Fix matching on all snps,dw-pcie instances
  of: address: Work around missing device_type property in pcie nodes
  dt: writing-schema: Miscellaneous grammar fixes
  dt-bindings: Use Shawn Guo's preferred e-mail for i.MX bindings
  of/address: check for invalid range.cpu_addr
parents f873db9a 5cd841d2
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Clock bindings for Freescale i.MX23 title: Clock bindings for Freescale i.MX23
maintainers: maintainers:
- Shawn Guo <shawn.guo@linaro.org> - Shawn Guo <shawnguo@kernel.org>
description: | description: |
The clock consumer should specify the desired clock by having the clock The clock consumer should specify the desired clock by having the clock
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Clock bindings for Freescale i.MX28 title: Clock bindings for Freescale i.MX28
maintainers: maintainers:
- Shawn Guo <shawn.guo@linaro.org> - Shawn Guo <shawnguo@kernel.org>
description: | description: |
The clock consumer should specify the desired clock by having the clock The clock consumer should specify the desired clock by having the clock
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale MXS GPIO controller title: Freescale MXS GPIO controller
maintainers: maintainers:
- Shawn Guo <shawn.guo@linaro.org> - Shawn Guo <shawnguo@kernel.org>
- Anson Huang <Anson.Huang@nxp.com> - Anson Huang <Anson.Huang@nxp.com>
description: | description: |
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale MXS Inter IC (I2C) Controller title: Freescale MXS Inter IC (I2C) Controller
maintainers: maintainers:
- Shawn Guo <shawn.guo@linaro.org> - Shawn Guo <shawnguo@kernel.org>
properties: properties:
compatible: compatible:
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale Enhanced Secure Digital Host Controller (eSDHC) for i.MX title: Freescale Enhanced Secure Digital Host Controller (eSDHC) for i.MX
maintainers: maintainers:
- Shawn Guo <shawn.guo@linaro.org> - Shawn Guo <shawnguo@kernel.org>
allOf: allOf:
- $ref: "mmc-controller.yaml" - $ref: "mmc-controller.yaml"
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale MXS MMC controller title: Freescale MXS MMC controller
maintainers: maintainers:
- Shawn Guo <shawn.guo@linaro.org> - Shawn Guo <shawnguo@kernel.org>
description: | description: |
The Freescale MXS Synchronous Serial Ports (SSP) can act as a MMC controller The Freescale MXS Synchronous Serial Ports (SSP) can act as a MMC controller
......
...@@ -54,7 +54,8 @@ properties: ...@@ -54,7 +54,8 @@ properties:
phy-connection-type: phy-connection-type:
description: description:
Operation mode of the PHY interface Specifies interface type between the Ethernet device and a physical
layer (PHY) device.
enum: enum:
# There is not a standard bus between the MAC and the PHY, # There is not a standard bus between the MAC and the PHY,
# something proprietary is being used to embed the PHY in the # something proprietary is being used to embed the PHY in the
......
...@@ -9,6 +9,14 @@ title: PCIe RC controller on Intel Gateway SoCs ...@@ -9,6 +9,14 @@ title: PCIe RC controller on Intel Gateway SoCs
maintainers: maintainers:
- Dilip Kota <eswara.kota@linux.intel.com> - Dilip Kota <eswara.kota@linux.intel.com>
select:
properties:
compatible:
contains:
const: intel,lgm-pcie
required:
- compatible
properties: properties:
compatible: compatible:
items: items:
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale MXS PWM controller title: Freescale MXS PWM controller
maintainers: maintainers:
- Shawn Guo <shawn.guo@linaro.org> - Shawn Guo <shawnguo@kernel.org>
- Anson Huang <anson.huang@nxp.com> - Anson Huang <anson.huang@nxp.com>
properties: properties:
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale (Enhanced) Configurable Serial Peripheral Interface (CSPI/eCSPI) for i.MX title: Freescale (Enhanced) Configurable Serial Peripheral Interface (CSPI/eCSPI) for i.MX
maintainers: maintainers:
- Shawn Guo <shawn.guo@linaro.org> - Shawn Guo <shawnguo@kernel.org>
allOf: allOf:
- $ref: "/schemas/spi/spi-controller.yaml#" - $ref: "/schemas/spi/spi-controller.yaml#"
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: NXP i.MX Thermal Binding title: NXP i.MX Thermal Binding
maintainers: maintainers:
- Shawn Guo <shawn.guo@linaro.org> - Shawn Guo <shawnguo@kernel.org>
- Anson Huang <Anson.Huang@nxp.com> - Anson Huang <Anson.Huang@nxp.com>
properties: properties:
......
...@@ -5,7 +5,7 @@ Writing DeviceTree Bindings in json-schema ...@@ -5,7 +5,7 @@ Writing DeviceTree Bindings in json-schema
Devicetree bindings are written using json-schema vocabulary. Schema files are Devicetree bindings are written using json-schema vocabulary. Schema files are
written in a JSON compatible subset of YAML. YAML is used instead of JSON as it written in a JSON compatible subset of YAML. YAML is used instead of JSON as it
considered more human readable and has some advantages such as allowing is considered more human readable and has some advantages such as allowing
comments (Prefixed with '#'). comments (Prefixed with '#').
Schema Contents Schema Contents
...@@ -19,7 +19,7 @@ $id ...@@ -19,7 +19,7 @@ $id
A json-schema unique identifier string. The string must be a valid A json-schema unique identifier string. The string must be a valid
URI typically containing the binding's filename and path. For DT schema, it must URI typically containing the binding's filename and path. For DT schema, it must
begin with "http://devicetree.org/schemas/". The URL is used in constructing begin with "http://devicetree.org/schemas/". The URL is used in constructing
references to other files specified in schema "$ref" properties. A $ref values references to other files specified in schema "$ref" properties. A $ref value
with a leading '/' will have the hostname prepended. A $ref value a relative with a leading '/' will have the hostname prepended. A $ref value a relative
path or filename only will be prepended with the hostname and path components path or filename only will be prepended with the hostname and path components
of the current schema file's '$id' value. A URL is used even for local files, of the current schema file's '$id' value. A URL is used even for local files,
......
...@@ -128,15 +128,29 @@ static unsigned int of_bus_pci_get_flags(const __be32 *addr) ...@@ -128,15 +128,29 @@ static unsigned int of_bus_pci_get_flags(const __be32 *addr)
* PCI bus specific translator * PCI bus specific translator
*/ */
static bool of_node_is_pcie(struct device_node *np)
{
bool is_pcie = of_node_name_eq(np, "pcie");
if (is_pcie)
pr_warn_once("%pOF: Missing device_type\n", np);
return is_pcie;
}
static int of_bus_pci_match(struct device_node *np) static int of_bus_pci_match(struct device_node *np)
{ {
/* /*
* "pciex" is PCI Express * "pciex" is PCI Express
* "vci" is for the /chaos bridge on 1st-gen PCI powermacs * "vci" is for the /chaos bridge on 1st-gen PCI powermacs
* "ht" is hypertransport * "ht" is hypertransport
*
* If none of the device_type match, and that the node name is
* "pcie", accept the device as PCI (with a warning).
*/ */
return of_node_is_type(np, "pci") || of_node_is_type(np, "pciex") || return of_node_is_type(np, "pci") || of_node_is_type(np, "pciex") ||
of_node_is_type(np, "vci") || of_node_is_type(np, "ht"); of_node_is_type(np, "vci") || of_node_is_type(np, "ht") ||
of_node_is_pcie(np);
} }
static void of_bus_pci_count_cells(struct device_node *np, static void of_bus_pci_count_cells(struct device_node *np,
...@@ -985,6 +999,11 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz ...@@ -985,6 +999,11 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz
/* Don't error out as we'd break some existing DTs */ /* Don't error out as we'd break some existing DTs */
continue; continue;
} }
if (range.cpu_addr == OF_BAD_ADDR) {
pr_err("translation of DMA address(%llx) to CPU address failed node(%pOF)\n",
range.bus_addr, node);
continue;
}
dma_offset = range.cpu_addr - range.bus_addr; dma_offset = range.cpu_addr - range.bus_addr;
/* Take lower and upper limits */ /* Take lower and upper limits */
......
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