97 lines
3.2 KiB
Diff
97 lines
3.2 KiB
Diff
From 4a9d7aa7063331a1ab7d5286efb8e9b4d042e77b Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Reichel <sebastian.reichel@collabora.com>
|
|
Date: Wed, 19 Apr 2023 14:57:14 +0200
|
|
Subject: [PATCH 430/469] dt-bindings: PCI: dwc: rockchip: Fix interrupt-names
|
|
issue
|
|
|
|
The RK356x (and RK3588) have 5 ganged interrupts. For example the
|
|
"legacy" interrupt combines "inta/intb/intc/intd" with a register
|
|
providing the details.
|
|
|
|
Currently the binding is not specifying these interrupts resulting
|
|
in a bunch of errors for all rk356x boards using PCIe.
|
|
|
|
Fix this by specifying the interrupts and add them to the example
|
|
to prevent regressions.
|
|
|
|
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
|
|
---
|
|
.../bindings/pci/rockchip-dw-pcie.yaml | 18 ++++++++++++++++++
|
|
.../devicetree/bindings/pci/snps,dw-pcie.yaml | 15 ++++++++++++++-
|
|
2 files changed, 32 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml b/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml
|
|
index 24c88942e59e..98e45d2d8dfe 100644
|
|
--- a/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml
|
|
+++ b/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml
|
|
@@ -56,6 +56,17 @@ properties:
|
|
- const: pclk
|
|
- const: aux
|
|
|
|
+ interrupts:
|
|
+ maxItems: 5
|
|
+
|
|
+ interrupt-names:
|
|
+ items:
|
|
+ - const: sys
|
|
+ - const: pmc
|
|
+ - const: msg
|
|
+ - const: legacy
|
|
+ - const: err
|
|
+
|
|
msi-map: true
|
|
|
|
num-lanes: true
|
|
@@ -98,6 +109,7 @@ unevaluatedProperties: false
|
|
|
|
examples:
|
|
- |
|
|
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
|
|
|
|
bus {
|
|
#address-cells = <2>;
|
|
@@ -117,6 +129,12 @@ examples:
|
|
"aclk_dbi", "pclk",
|
|
"aux";
|
|
device_type = "pci";
|
|
+ interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ interrupt-names = "sys", "pmc", "msg", "legacy", "err";
|
|
linux,pci-domain = <2>;
|
|
max-link-speed = <2>;
|
|
msi-map = <0x2000 &its 0x2000 0x1000>;
|
|
diff --git a/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml b/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
|
|
index 1a83f0f65f19..9f605eb297f5 100644
|
|
--- a/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
|
|
+++ b/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
|
|
@@ -193,9 +193,22 @@ properties:
|
|
oneOf:
|
|
- description: See native "app" IRQ for details
|
|
enum: [ intr ]
|
|
+ - description: Combined Legacy A/B/C/D interrupt signal.
|
|
+ const: legacy
|
|
+ - description: Combined System interrupt signal.
|
|
+ const: sys
|
|
+ - description: Combined Power Management interrupt signal.
|
|
+ const: pmc
|
|
+ - description: Combined Message Received interrupt signal.
|
|
+ const: msg
|
|
+ - description: Combined Error interrupt signal.
|
|
+ const: err
|
|
+
|
|
allOf:
|
|
- contains:
|
|
- const: msi
|
|
+ enum:
|
|
+ - msi
|
|
+ - msg
|
|
|
|
additionalProperties: true
|
|
|
|
--
|
|
2.34.1
|
|
|