Commit 2634744b authored by Linus Torvalds's avatar Linus Torvalds

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

Pull devicetree fixes from Rob Herring:

 - Fix incorrect $id paths in schemas

 - Two fixes for Intel LGM SoC binding schemas

* tag 'devicetree-fixes-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: Fix paths in schema $id fields
  dt-bindings: PCI: intel: Fix dt_binding_check compilation failure
  dt-bindings: phy: Fix errors in intel,lgm-emmc-phy example
parents cfb4b571 04dbd865
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/arm/fsl.yaml# $id: http://devicetree.org/schemas/arm/fsl.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale i.MX Platforms Device Tree Bindings title: Freescale i.MX Platforms Device Tree Bindings
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/arm/qcom.yaml# $id: http://devicetree.org/schemas/arm/qcom.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: QCOM device tree bindings title: QCOM device tree bindings
......
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/bitmain,bm1880-clk.yaml# $id: http://devicetree.org/schemas/clock/bitmain,bm1880-clk.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Bitmain BM1880 Clock Controller title: Bitmain BM1880 Clock Controller
......
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/fsl,sai-clock.yaml# $id: http://devicetree.org/schemas/clock/fsl,sai-clock.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale SAI bitclock-as-a-clock binding title: Freescale SAI bitclock-as-a-clock binding
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/imx8mn-clock.yaml# $id: http://devicetree.org/schemas/clock/imx8mn-clock.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: NXP i.MX8M Nano Clock Control Module Binding title: NXP i.MX8M Nano Clock Control Module Binding
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/imx8mp-clock.yaml# $id: http://devicetree.org/schemas/clock/imx8mp-clock.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: NXP i.MX8M Plus Clock Control Module Binding title: NXP i.MX8M Plus Clock Control Module Binding
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/milbeaut-clock.yaml# $id: http://devicetree.org/schemas/clock/milbeaut-clock.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Milbeaut SoCs Clock Controller Binding title: Milbeaut SoCs Clock Controller Binding
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/qcom,dispcc.yaml# $id: http://devicetree.org/schemas/clock/qcom,dispcc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Display Clock & Reset Controller Binding title: Qualcomm Display Clock & Reset Controller Binding
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/qcom,gcc.yaml# $id: http://devicetree.org/schemas/clock/qcom,gcc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Global Clock & Reset Controller Binding title: Qualcomm Global Clock & Reset Controller Binding
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/qcom,gpucc.yaml# $id: http://devicetree.org/schemas/clock/qcom,gpucc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Graphics Clock & Reset Controller Binding title: Qualcomm Graphics Clock & Reset Controller Binding
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/qcom,mmcc.yaml# $id: http://devicetree.org/schemas/clock/qcom,mmcc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Multimedia Clock & Reset Controller Binding title: Qualcomm Multimedia Clock & Reset Controller Binding
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/qcom,rpmhcc.yaml# $id: http://devicetree.org/schemas/clock/qcom,rpmhcc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Technologies, Inc. RPMh Clocks Bindings title: Qualcomm Technologies, Inc. RPMh Clocks Bindings
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/qcom,videocc.yaml# $id: http://devicetree.org/schemas/clock/qcom,videocc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Video Clock & Reset Controller Binding title: Qualcomm Video Clock & Reset Controller Binding
......
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/st,stm32mp1-rcc.yaml# $id: http://devicetree.org/schemas/clock/st,stm32mp1-rcc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Reset Clock Controller Binding title: Reset Clock Controller Binding
......
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/clock/xlnx,versal-clk.yaml# $id: http://devicetree.org/schemas/clock/xlnx,versal-clk.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Xilinx Versal clock controller title: Xilinx Versal clock controller
......
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/hwmon/adi,ltc2947.yaml# $id: http://devicetree.org/schemas/hwmon/adi,ltc2947.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Analog Devices LTC2947 high precision power and energy monitor title: Analog Devices LTC2947 high precision power and energy monitor
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Copyright 2019 Analog Devices Inc. # Copyright 2019 Analog Devices Inc.
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/iio/adc/adi,ad7124.yaml# $id: http://devicetree.org/schemas/iio/adc/adi,ad7124.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Analog Devices AD7124 ADC device driver title: Analog Devices AD7124 ADC device driver
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Copyright 2019 Analog Devices Inc. # Copyright 2019 Analog Devices Inc.
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/iio/adc/adi,ad7192.yaml# $id: http://devicetree.org/schemas/iio/adc/adi,ad7192.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Analog Devices AD7192 ADC device driver title: Analog Devices AD7192 ADC device driver
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Copyright 2019 Marcus Folkesson <marcus.folkesson@gmail.com> # Copyright 2019 Marcus Folkesson <marcus.folkesson@gmail.com>
%YAML 1.2 %YAML 1.2
--- ---
$id: "http://devicetree.org/schemas/bindings/iio/adc/microchip,mcp3911.yaml#" $id: "http://devicetree.org/schemas/iio/adc/microchip,mcp3911.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#" $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Microchip MCP3911 Dual channel analog front end (ADC) title: Microchip MCP3911 Dual channel analog front end (ADC)
......
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/st,stm32-dfsdm-adc.yaml# $id: http://devicetree.org/schemas/iio/adc/st,stm32-dfsdm-adc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: STMicroelectronics STM32 DFSDM ADC device driver title: STMicroelectronics STM32 DFSDM ADC device driver
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Copyright 2019 Marcus Folkesson <marcus.folkesson@gmail.com> # Copyright 2019 Marcus Folkesson <marcus.folkesson@gmail.com>
%YAML 1.2 %YAML 1.2
--- ---
$id: "http://devicetree.org/schemas/bindings/iio/dac/lltc,ltc1660.yaml#" $id: "http://devicetree.org/schemas/iio/dac/lltc,ltc1660.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#" $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Linear Technology Micropower octal 8-Bit and 10-Bit DACs title: Linear Technology Micropower octal 8-Bit and 10-Bit DACs
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
%YAML 1.2 %YAML 1.2
--- ---
$id: http://devicetree.org/schemas/bindings/input/gpio-vibrator.yaml# $id: http://devicetree.org/schemas/input/gpio-vibrator.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml#
title: GPIO vibrator title: GPIO vibrator
......
...@@ -107,7 +107,6 @@ additionalProperties: false ...@@ -107,7 +107,6 @@ additionalProperties: false
examples: examples:
- | - |
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/clock/intel,lgm-clk.h>
pcie10: pcie@d0e00000 { pcie10: pcie@d0e00000 {
compatible = "intel,lgm-pcie", "snps,dw-pcie"; compatible = "intel,lgm-pcie", "snps,dw-pcie";
device_type = "pci"; device_type = "pci";
...@@ -120,7 +119,6 @@ examples: ...@@ -120,7 +119,6 @@ examples:
linux,pci-domain = <0>; linux,pci-domain = <0>;
max-link-speed = <4>; max-link-speed = <4>;
bus-range = <0x00 0x08>; bus-range = <0x00 0x08>;
interrupt-parent = <&ioapic1>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 0x7>; interrupt-map-mask = <0 0 0 0x7>;
interrupt-map = <0 0 0 1 &ioapic1 27 1>, interrupt-map = <0 0 0 1 &ioapic1 27 1>,
...@@ -129,7 +127,7 @@ examples: ...@@ -129,7 +127,7 @@ examples:
<0 0 0 4 &ioapic1 30 1>; <0 0 0 4 &ioapic1 30 1>;
ranges = <0x02000000 0 0xd4000000 0xd4000000 0 0x04000000>; ranges = <0x02000000 0 0xd4000000 0xd4000000 0 0x04000000>;
resets = <&rcu0 0x50 0>; resets = <&rcu0 0x50 0>;
clocks = <&cgu0 LGM_GCLK_PCIE10>; clocks = <&cgu0 120>;
phys = <&cb0phy0>; phys = <&cb0phy0>;
phy-names = "pcie"; phy-names = "pcie";
reset-assert-ms = <500>; reset-assert-ms = <500>;
......
...@@ -45,8 +45,10 @@ examples: ...@@ -45,8 +45,10 @@ examples:
sysconf: chiptop@e0200000 { sysconf: chiptop@e0200000 {
compatible = "intel,lgm-syscon", "syscon"; compatible = "intel,lgm-syscon", "syscon";
reg = <0xe0200000 0x100>; reg = <0xe0200000 0x100>;
#address-cells = <1>;
#size-cells = <1>;
emmc-phy: emmc-phy@a8 { emmc_phy: emmc-phy@a8 {
compatible = "intel,lgm-emmc-phy"; compatible = "intel,lgm-emmc-phy";
reg = <0x00a8 0x10>; reg = <0x00a8 0x10>;
clocks = <&emmc>; clocks = <&emmc>;
......
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