Skip to content

Commit

Permalink
dt-bindings: Fix missing '/schemas' in $ref paths
Browse files Browse the repository at this point in the history
Absolute paths in $ref should always begin with '/schemas'. The tools
mostly work with it omitted, but for correctness the path should be
everything except the hostname as that is taken from the schema's $id
value. This scheme is defined in the json-schema spec.

Cc: Hector Martin <marcan@marcan.st>
Cc: Sven Peter <sven@svenpeter.dev>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Vivien Didelot <vivien.didelot@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Vladimir Oltean <olteanv@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Chunfeng Yun <chunfeng.yun@mediatek.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Mukesh Savaliya <msavaliy@codeaurora.org>
Cc: Akash Asthana <akashast@codeaurora.org>
Cc: Bayi Cheng <bayi.cheng@mediatek.com>
Cc: Chuanhong Guo <gch981213@gmail.com>
Cc: Min Guo <min.guo@mediatek.com>
Cc: netdev@vger.kernel.org
Cc: linux-spi@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Mark Brown <broonie@debian.org>
Link: https://lore.kernel.org/r/20220325215652.525383-1-robh@kernel.org
  • Loading branch information
Rob Herring committed Mar 29, 2022
1 parent a50e431 commit 22a41e9
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ patternProperties:
description:
The individual power management domains within this controller
type: object
$ref: /power/apple,pmgr-pwrstate.yaml#
$ref: /schemas/power/apple,pmgr-pwrstate.yaml#

required:
- compatible
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/net/dsa/dsa-port.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ description:
Ethernet switch port Description

allOf:
- $ref: "http://devicetree.org/schemas/net/ethernet-controller.yaml#"
- $ref: /schemas/net/ethernet-controller.yaml#

properties:
reg:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ patternProperties:
supports up to 50MHz, up to four chip selects, programmable
data path from 4 bits to 32 bits and numerous protocol
variants.
$ref: /spi/spi-controller.yaml#
$ref: /schemas/spi/spi-controller.yaml#

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ description: |
capability of this controller.
allOf:
- $ref: /spi/spi-controller.yaml#
- $ref: /schemas/spi/spi-controller.yaml#

properties:
compatible:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ description: The QSPI controller allows SPI protocol communication in single,
as NOR flash.

allOf:
- $ref: /spi/spi-controller.yaml#
- $ref: /schemas/spi/spi-controller.yaml#

properties:
compatible:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/spi/sprd,spi-adi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ description: |
compatibility.
allOf:
- $ref: /spi/spi-controller.yaml#
- $ref: /schemas/spi/spi-controller.yaml#

properties:
compatible:
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ properties:
default: host

connector:
$ref: /connector/usb-connector.yaml#
$ref: /schemas/connector/usb-connector.yaml#
description:
Connector for dual role switch, especially for "gpio-usb-b-connector"
type: object
Expand Down Expand Up @@ -191,7 +191,7 @@ properties:
patternProperties:
"^usb@[0-9a-f]+$":
type: object
$ref: /usb/mediatek,mtk-xhci.yaml#
$ref: /schemas/usb/mediatek,mtk-xhci.yaml#
description:
The xhci should be added as subnode to mtu3 as shown in the following
example if the host mode is enabled.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/usb/mediatek,musb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ properties:
maxItems: 1

connector:
$ref: /connector/usb-connector.yaml#
$ref: /schemas/connector/usb-connector.yaml#
description: Connector for dual role switch
type: object

Expand Down

0 comments on commit 22a41e9

Please sign in to comment.