Hi Rob,
This series applies after this one:
https://lore.kernel.org/lkml/[email protected]/
It basically converts two PCI DT-bindings to DT schema. On this version, I'm
addressing some of your comments from v2, and rebased it on the top of
my Hikey 960/970 tree (based on linus/master).
The example for the designware file is producing some warnings here, as it
can't find the right propertiesPattern. No idea why.
Mauro Carvalho Chehab (2):
dt-bindings: PCI: designware-pcie.txt: convert it to yaml
dt-bindings: PCI: kirin-pcie.txt: convert it to yaml
.../bindings/pci/amlogic,meson-pcie.txt | 4 +-
.../bindings/pci/axis,artpec6-pcie.txt | 2 +-
.../bindings/pci/designware-pcie.txt | 77 ----------
.../bindings/pci/fsl,imx6q-pcie.txt | 2 +-
.../bindings/pci/hisilicon,kirin-pcie.yaml | 79 ++++++++++
.../bindings/pci/hisilicon-histb-pcie.txt | 2 +-
.../devicetree/bindings/pci/kirin-pcie.txt | 41 ------
.../bindings/pci/layerscape-pci.txt | 2 +-
.../bindings/pci/nvidia,tegra194-pcie.txt | 4 +-
.../devicetree/bindings/pci/pci-armada8k.txt | 2 +-
.../devicetree/bindings/pci/pcie-al.txt | 2 +-
.../devicetree/bindings/pci/qcom,pcie.txt | 14 +-
.../bindings/pci/samsung,exynos-pcie.yaml | 2 +-
.../bindings/pci/sifive,fu740-pcie.yaml | 2 +-
.../devicetree/bindings/pci/snps,dw-pcie.yaml | 135 ++++++++++++++++++
.../pci/socionext,uniphier-pcie-ep.yaml | 2 +-
.../devicetree/bindings/pci/ti-pci.txt | 4 +-
.../devicetree/bindings/pci/uniphier-pcie.txt | 2 +-
MAINTAINERS | 4 +-
19 files changed, 239 insertions(+), 143 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/pci/designware-pcie.txt
create mode 100644 Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml
delete mode 100644 Documentation/devicetree/bindings/pci/kirin-pcie.txt
create mode 100644 Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
--
2.31.1
Convert the file into a JSON description at the yaml format.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
.../bindings/pci/hisilicon,kirin-pcie.yaml | 79 +++++++++++++++++++
.../devicetree/bindings/pci/kirin-pcie.txt | 41 ----------
MAINTAINERS | 2 +-
3 files changed, 80 insertions(+), 42 deletions(-)
create mode 100644 Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml
delete mode 100644 Documentation/devicetree/bindings/pci/kirin-pcie.txt
diff --git a/Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml b/Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml
new file mode 100644
index 000000000000..66271419cd6e
--- /dev/null
+++ b/Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml
@@ -0,0 +1,79 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pci/hisilicon,kirin-pcie.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: HiSilicon Kirin SoCs PCIe host DT description
+
+maintainers:
+ - Xiaowei Song <[email protected]>
+ - Binghui Wang <[email protected]>
+
+description: |
+ Kirin PCIe host controller is based on the Synopsys DesignWare PCI core.
+ It shares common functions with the PCIe DesignWare core driver and
+ inherits common properties defined in
+ Documentation/devicetree/bindings/pci/designware,pcie.yaml.
+
+allOf:
+ - $ref: /schemas/pci/pci-bus.yaml#
+
+properties:
+ compatible:
+ const: hisilicon,kirin960-pcie
+ const: hisilicon,kirin970-pcie
+
+ reg:
+ description: |
+ Should contain rc_dbi, apb, config registers location and length.
+
+ reg-names:
+ items:
+ - const: dbi # controller configuration registers
+ - const: apb # apb Ctrl register defined by Kirin
+ - const: config # PCIe configuration space registers
+
+ "#address-cells":
+ const: 3
+
+ "#size-cells":
+ const: 2
+
+required:
+ - compatible
+ - reg
+ - reg-names
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+ soc {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ pcie: pcie@f4000000 {
+ compatible = "hisilicon,kirin960-pcie";
+ reg = <0x0 0xf4000000 0x0 0x1000>,
+ <0x0 0xff3fe000 0x0 0x1000>,
+ <0x0 0xf4000000 0 0x2000>;
+ reg-names = "dbi","apb", "config";
+ bus-range = <0x0 0x1>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ device_type = "pci";
+ ranges = <0x02000000 0x0 0x00000000 0x0 0xf5000000 0x0 0x2000000>;
+ num-lanes = <1>;
+ #interrupt-cells = <1>;
+ interrupts = <0 283 4>;
+ interrupt-names = "msi";
+ interrupt-map-mask = <0xf800 0 0 7>;
+ interrupt-map = <0x0 0 0 1 &gic GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
+ <0x0 0 0 2 &gic GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>,
+ <0x0 0 0 3 &gic GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>,
+ <0x0 0 0 4 &gic GIC_SPI 285 IRQ_TYPE_LEVEL_HIGH>;
+ };
+ };
diff --git a/Documentation/devicetree/bindings/pci/kirin-pcie.txt b/Documentation/devicetree/bindings/pci/kirin-pcie.txt
deleted file mode 100644
index 3a36eeb1c434..000000000000
--- a/Documentation/devicetree/bindings/pci/kirin-pcie.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-HiSilicon Kirin SoCs PCIe host DT description
-
-Kirin PCIe host controller is based on the Synopsys DesignWare PCI core.
-It shares common functions with the PCIe DesignWare core driver and
-inherits common properties defined in
-Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml.
-
-Additional properties are described here:
-
-Required properties
-- compatible:
- "hisilicon,kirin960-pcie"
- "hisilicon,kirin970-pcie"
-- reg: Should contain rc_dbi, apb, config registers location and length.
-- reg-names: Must include the following entries:
- "dbi": controller configuration registers;
- "apb": apb Ctrl register defined by Kirin;
- "config": PCIe configuration space registers.
-
-Optional properties:
-
-Example based on kirin960:
-
- pcie@f4000000 {
- compatible = "hisilicon,kirin960-pcie";
- reg = <0x0 0xf4000000 0x0 0x1000>, <0x0 0xff3fe000 0x0 0x1000>,
- <0x0 0xF4000000 0 0x2000>;
- reg-names = "dbi","apb", "config";
- bus-range = <0x0 0x1>;
- #address-cells = <3>;
- #size-cells = <2>;
- device_type = "pci";
- ranges = <0x02000000 0x0 0x00000000 0x0 0xf5000000 0x0 0x2000000>;
- num-lanes = <1>;
- #interrupt-cells = <1>;
- interrupt-map-mask = <0xf800 0 0 7>;
- interrupt-map = <0x0 0 0 1 &gic 0 0 0 282 4>,
- <0x0 0 0 2 &gic 0 0 0 283 4>,
- <0x0 0 0 3 &gic 0 0 0 284 4>,
- <0x0 0 0 4 &gic 0 0 0 285 4>;
- };
diff --git a/MAINTAINERS b/MAINTAINERS
index 55ca4cac17b0..d5a592db84d9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14369,7 +14369,7 @@ M: Xiaowei Song <[email protected]>
M: Binghui Wang <[email protected]>
L: [email protected]
S: Maintained
-F: Documentation/devicetree/bindings/pci/kirin-pcie.txt
+F: Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml
F: drivers/pci/controller/dwc/pcie-kirin.c
PCIE DRIVER FOR HISILICON STB
--
2.31.1