diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-12-16 00:11:11 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-12-16 00:11:11 +0300 |
| commit | ee4871d0102b09d1b23b95f2f746baf327205876 (patch) | |
| tree | 341a2ed6d686f3eb3dc01f10ac1367cd0a44216d /drivers/pci/controller/cadence/pcie-cadence.h | |
| parent | 0032242459e72d92b997d983b0562b453fbf8fcf (diff) | |
| parent | 7aa256234c4c86d8b8fa19a7647051b8fd9721d9 (diff) | |
| download | linux-ee4871d0102b09d1b23b95f2f746baf327205876.tar.xz | |
Merge branch 'remotes/lorenzo/pci/cadence'
- Make "cdns,max-outbound-regions" optional (Kishon Vijay Abraham I)
- Fix "ti,syscon-pcie-ctrl" DT property to take argument (Kishon Vijay
Abraham I)
- Add TI J7200 host and endpoint mode DT bindings (Kishon Vijay Abraham I)
* remotes/lorenzo/pci/cadence:
PCI: j721e: Get offset within "syscon" from "ti,syscon-pcie-ctrl" phandle arg
dt-bindings: PCI: Add EP mode dt-bindings for TI's J7200 SoC
dt-bindings: PCI: Add host mode dt-bindings for TI's J7200 SoC
dt-bindings: pci: ti,j721e: Fix "ti,syscon-pcie-ctrl" to take argument
PCI: cadence: Do not error if "cdns,max-outbound-regions" is not found
dt-bindings: PCI: Make "cdns,max-outbound-regions" optional property
Diffstat (limited to 'drivers/pci/controller/cadence/pcie-cadence.h')
| -rw-r--r-- | drivers/pci/controller/cadence/pcie-cadence.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/controller/cadence/pcie-cadence.h b/drivers/pci/controller/cadence/pcie-cadence.h index feed1e3038f4..30eba6cafe2c 100644 --- a/drivers/pci/controller/cadence/pcie-cadence.h +++ b/drivers/pci/controller/cadence/pcie-cadence.h @@ -197,6 +197,7 @@ enum cdns_pcie_rp_bar { }; #define CDNS_PCIE_RP_MAX_IB 0x3 +#define CDNS_PCIE_MAX_OB 32 struct cdns_pcie_rp_ib_bar { u64 size; |