diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2022-08-04 19:41:58 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-08-04 19:41:58 +0300 |
| commit | 3aa321dc0afc6372384bafd336439ac60fad1a90 (patch) | |
| tree | 504dfa2e505e56941e5b890ceb1f535a455178ab /drivers | |
| parent | 9195e6dd9b49b98e2bdfea94a5737142d4f49c6a (diff) | |
| parent | aefffba672881f7fdb29ec15fcbcab55f3c0592d (diff) | |
| download | linux-3aa321dc0afc6372384bafd336439ac60fad1a90.tar.xz | |
Merge branch 'pci/ctrl/rcar-gen2'
- Convert DT binding to json-schema (Herve Codina)
- Add Renesas RZ/N1D (R9A06G032) to rcar-gen2 DT binding (Herve Codina)
- Add Renesas RZ/N1D compatible string ("renesas,pci-rzn1") to rcar-gen2
driver (Herve Codina)
* pci/ctrl/rcar-gen2:
PCI: rcar-gen2: Add RZ/N1 SOC family compatible string
dt-bindings: PCI: renesas,pci-rcar-gen2: Add device tree support for R9A06G032
dt-bindings: PCI: pci-rcar-gen2: Convert bindings to json-schema
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/controller/pci-rcar-gen2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/controller/pci-rcar-gen2.c b/drivers/pci/controller/pci-rcar-gen2.c index 35804ea394fd..839695791757 100644 --- a/drivers/pci/controller/pci-rcar-gen2.c +++ b/drivers/pci/controller/pci-rcar-gen2.c @@ -328,6 +328,7 @@ static const struct of_device_id rcar_pci_of_match[] = { { .compatible = "renesas,pci-r8a7791", }, { .compatible = "renesas,pci-r8a7794", }, { .compatible = "renesas,pci-rcar-gen2", }, + { .compatible = "renesas,pci-rzn1", }, { }, }; |