Merge branch 'remotes/lorenzo/pci/rcar'
- Document R8A774A1, R8A774B1, R8A774E1 endpoint support in DT (Lad Prabhakar) - Add R8A774A1, R8A774B1, R8A774E1 (RZ/G2M, RZ/G2N, RZ/G2H) IDs to endpoint test (Lad Prabhakar) - Add device tree support for R8A7742 (Lad Prabhakar) - Use "fallthrough" pseudo-keyword (Gustavo A. R. Silva) * remotes/lorenzo/pci/rcar: dt-bindings: PCI: rcar: Add device tree support for r8a7742 PCI: rcar-gen2: Use fallthrough pseudo-keyword misc: pci_endpoint_test: Add Device ID for RZ/G2H PCIe controller dt-bindings: pci: rcar-pci-ep: Document r8a774e1 misc: pci_endpoint_test: Add Device ID for RZ/G2M and RZ/G2N PCIe controllers dt-bindings: pci: rcar-pci-ep: Document r8a774a1 and r8a774b1
This commit is contained in:
Коммит
f95f023d11
|
@ -14,8 +14,12 @@ maintainers:
|
|||
properties:
|
||||
compatible:
|
||||
items:
|
||||
- const: renesas,r8a774c0-pcie-ep
|
||||
- const: renesas,rcar-gen3-pcie-ep
|
||||
- enum:
|
||||
- renesas,r8a774a1-pcie-ep # RZ/G2M
|
||||
- renesas,r8a774b1-pcie-ep # RZ/G2N
|
||||
- renesas,r8a774c0-pcie-ep # RZ/G2E
|
||||
- renesas,r8a774e1-pcie-ep # RZ/G2H
|
||||
- const: renesas,rcar-gen3-pcie-ep # R-Car Gen3 and RZ/G2
|
||||
|
||||
reg:
|
||||
maxItems: 5
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
* Renesas R-Car PCIe interface
|
||||
|
||||
Required properties:
|
||||
compatible: "renesas,pcie-r8a7743" for the R8A7743 SoC;
|
||||
compatible: "renesas,pcie-r8a7742" for the R8A7742 SoC;
|
||||
"renesas,pcie-r8a7743" for the R8A7743 SoC;
|
||||
"renesas,pcie-r8a7744" for the R8A7744 SoC;
|
||||
"renesas,pcie-r8a774a1" for the R8A774A1 SoC;
|
||||
"renesas,pcie-r8a774b1" for the R8A774B1 SoC;
|
||||
|
|
|
@ -75,7 +75,10 @@
|
|||
#define is_am654_pci_dev(pdev) \
|
||||
((pdev)->device == PCI_DEVICE_ID_TI_AM654)
|
||||
|
||||
#define PCI_DEVICE_ID_RENESAS_R8A774A1 0x0028
|
||||
#define PCI_DEVICE_ID_RENESAS_R8A774B1 0x002b
|
||||
#define PCI_DEVICE_ID_RENESAS_R8A774C0 0x002d
|
||||
#define PCI_DEVICE_ID_RENESAS_R8A774E1 0x0025
|
||||
|
||||
static DEFINE_IDA(pci_endpoint_test_ida);
|
||||
|
||||
|
@ -956,8 +959,10 @@ static const struct pci_device_id pci_endpoint_test_tbl[] = {
|
|||
{ PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_AM654),
|
||||
.driver_data = (kernel_ulong_t)&am654_data
|
||||
},
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774C0),
|
||||
},
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774A1),},
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774B1),},
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774C0),},
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_RENESAS, PCI_DEVICE_ID_RENESAS_R8A774E1),},
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_J721E),
|
||||
.driver_data = (kernel_ulong_t)&j721e_data,
|
||||
},
|
||||
|
|
|
@ -223,7 +223,7 @@ static void rcar_pci_setup(struct rcar_pci_priv *priv)
|
|||
pr_warn("unknown window size %ld - defaulting to 256M\n",
|
||||
window_size);
|
||||
window_size = SZ_256M;
|
||||
/* fall-through */
|
||||
fallthrough;
|
||||
case SZ_256M:
|
||||
val |= RCAR_USBCTR_PCIAHB_WIN1_256M;
|
||||
break;
|
||||
|
|
Загрузка…
Ссылка в новой задаче