mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-31 03:35:32 -04:00
Merge branch 'pci/dt-binding'
- Add qcom IPQ9650 compatible with global interrupt (Kathiravan Thirumoorthy) - Add qcom IPQ5210 compatible with IPQ9574 fallback (Varadarajan Narayanan) - Add imx6 intr/aer/pme interrupt lines for i.MX95 (Richard Zhu) - Add mediatek-gen3 'memory-region' for restricted DMA buffer (Chen-Yu Tsai) - Add rcar-gen4-pci-host optional 'msi-parent' for GIT ITS (Marek Vasut) - Correct some white-space issues (Krzysztof Kozlowski) * pci/dt-binding: dt-bindings: PCI: Correct white-space style dt-bindings: PCI: rcar-gen4-pci-host: Document optional msi-parent dt-bindings: PCI: mediatek-gen3: Allow memory-region for restricted DMA buffer dt-bindings: PCI: mediatek-gen3: Add support for MT8189 SoC dt-bindings: PCI: imx6q-pcie: Add i.MX95 optional intr/aer/pme interrupts dt-bindings: PCI: qcom,pcie-ipq9574: Add IPQ5210 compatible dt-bindings: PCI: qcom,pcie-ipq9574: Add IPQ9650 compatible
This commit is contained in:
@@ -214,7 +214,7 @@ examples:
|
||||
dma-ranges = <0x42000000 0x1 0x00000000 0x0 0x40000000 0x0 0x80000000>,
|
||||
<0x42000000 0x1 0x80000000 0x3 0x00000000 0x0 0x80000000>;
|
||||
brcm,enable-ssc;
|
||||
brcm,scb-sizes = <0x0000000080000000 0x0000000080000000>;
|
||||
brcm,scb-sizes = <0x0000000080000000 0x0000000080000000>;
|
||||
|
||||
/* PCIe bridge, Root Port */
|
||||
pci@0,0 {
|
||||
|
||||
@@ -58,12 +58,18 @@ properties:
|
||||
items:
|
||||
- description: builtin MSI controller.
|
||||
- description: builtin DMA controller.
|
||||
- description: PCIe event interrupt.
|
||||
- description: builtin AER SPI standalone interrupt line.
|
||||
- description: builtin PME SPI standalone interrupt line.
|
||||
|
||||
interrupt-names:
|
||||
minItems: 1
|
||||
items:
|
||||
- const: msi
|
||||
- const: dma
|
||||
- const: intr
|
||||
- const: aer
|
||||
- const: pme
|
||||
|
||||
reset-gpio:
|
||||
deprecated: true
|
||||
@@ -249,6 +255,25 @@ allOf:
|
||||
- const: ref
|
||||
- const: extref # Optional
|
||||
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- fsl,imx6q-pcie
|
||||
- fsl,imx6sx-pcie
|
||||
- fsl,imx6qp-pcie
|
||||
- fsl,imx7d-pcie
|
||||
- fsl,imx8mm-pcie
|
||||
- fsl,imx8mp-pcie
|
||||
- fsl,imx8mq-pcie
|
||||
- fsl,imx8q-pcie
|
||||
then:
|
||||
properties:
|
||||
interrupts:
|
||||
maxItems: 2
|
||||
interrupt-names:
|
||||
maxItems: 2
|
||||
|
||||
unevaluatedProperties: false
|
||||
|
||||
examples:
|
||||
|
||||
@@ -51,6 +51,7 @@ properties:
|
||||
- mediatek,mt7981-pcie
|
||||
- mediatek,mt7986-pcie
|
||||
- mediatek,mt8188-pcie
|
||||
- mediatek,mt8189-pcie
|
||||
- mediatek,mt8195-pcie
|
||||
- const: mediatek,mt8192-pcie
|
||||
- items:
|
||||
@@ -115,6 +116,10 @@ properties:
|
||||
power-domains:
|
||||
maxItems: 1
|
||||
|
||||
memory-region:
|
||||
maxItems: 1
|
||||
description: phandle to restricted DMA buffer
|
||||
|
||||
mediatek,pbus-csr:
|
||||
$ref: /schemas/types.yaml#/definitions/phandle-array
|
||||
items:
|
||||
@@ -193,6 +198,7 @@ allOf:
|
||||
contains:
|
||||
enum:
|
||||
- mediatek,mt8188-pcie
|
||||
- mediatek,mt8189-pcie
|
||||
- mediatek,mt8195-pcie
|
||||
then:
|
||||
properties:
|
||||
|
||||
@@ -17,8 +17,10 @@ properties:
|
||||
- qcom,pcie-ipq9574
|
||||
- items:
|
||||
- enum:
|
||||
- qcom,pcie-ipq5210
|
||||
- qcom,pcie-ipq5332
|
||||
- qcom,pcie-ipq5424
|
||||
- qcom,pcie-ipq9650
|
||||
- const: qcom,pcie-ipq9574
|
||||
|
||||
reg:
|
||||
@@ -82,6 +84,19 @@ required:
|
||||
|
||||
allOf:
|
||||
- $ref: qcom,pcie-common.yaml#
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
enum:
|
||||
- qcom,pcie-ipq5210
|
||||
- qcom,pcie-ipq9650
|
||||
then:
|
||||
properties:
|
||||
interrupts:
|
||||
minItems: 9
|
||||
interrupt-names:
|
||||
minItems: 9
|
||||
|
||||
unevaluatedProperties: false
|
||||
|
||||
|
||||
@@ -66,6 +66,9 @@ properties:
|
||||
max-link-speed:
|
||||
maximum: 4
|
||||
|
||||
msi-parent:
|
||||
maxItems: 1
|
||||
|
||||
num-lanes:
|
||||
maximum: 4
|
||||
|
||||
|
||||
@@ -155,7 +155,7 @@ examples:
|
||||
#include <dt-bindings/clock/r8a7790-cpg-mssr.h>
|
||||
#include <dt-bindings/power/r8a7790-sysc.h>
|
||||
|
||||
pci@ee090000 {
|
||||
pci@ee090000 {
|
||||
compatible = "renesas,pci-r8a7790", "renesas,pci-rcar-gen2";
|
||||
device_type = "pci";
|
||||
reg = <0xee090000 0xc00>,
|
||||
|
||||
@@ -63,10 +63,10 @@ examples:
|
||||
|
||||
pcie0_ep: pcie-ep@5500000 {
|
||||
compatible = "ti,am654-pcie-ep";
|
||||
reg = <0x5500000 0x1000>,
|
||||
<0x5501000 0x1000>,
|
||||
<0x10000000 0x8000000>,
|
||||
<0x5506000 0x1000>;
|
||||
reg = <0x5500000 0x1000>,
|
||||
<0x5501000 0x1000>,
|
||||
<0x10000000 0x8000000>,
|
||||
<0x5506000 0x1000>;
|
||||
reg-names = "app", "dbics", "addr_space", "atu";
|
||||
power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>;
|
||||
ti,syscon-pcie-mode = <&scm_conf 0x4060>;
|
||||
|
||||
@@ -121,12 +121,12 @@ examples:
|
||||
|
||||
pcie0_rc: pcie@5500000 {
|
||||
compatible = "ti,am654-pcie-rc";
|
||||
reg = <0x5500000 0x1000>,
|
||||
<0x5501000 0x1000>,
|
||||
<0x10000000 0x2000>,
|
||||
<0x5506000 0x1000>,
|
||||
<0x2900000 0x1000>,
|
||||
<0x2908000 0x1000>;
|
||||
reg = <0x5500000 0x1000>,
|
||||
<0x5501000 0x1000>,
|
||||
<0x10000000 0x2000>,
|
||||
<0x5506000 0x1000>,
|
||||
<0x2900000 0x1000>,
|
||||
<0x2908000 0x1000>;
|
||||
reg-names = "app", "dbics", "config", "atu", "vmap_lp", "vmap_hp";
|
||||
power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>;
|
||||
#address-cells = <3>;
|
||||
|
||||
Reference in New Issue
Block a user