diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-06-04 12:59:17 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-06-04 12:59:17 -0500 |
| commit | 210d8ea82a0bd4ea10ee46690a1edf5def9dcd63 (patch) | |
| tree | 7217dddd410f57eb203dc87119243b9c77e8b41a | |
| parent | 7c9908d3c8ef66411fc6a6e31ee283712c13928a (diff) | |
| parent | 7fdde0f9a571b1e9a31a839d3e10a3ee46a1145c (diff) | |
| download | linux-stable-210d8ea82a0bd4ea10ee46690a1edf5def9dcd63.tar.gz linux-stable-210d8ea82a0bd4ea10ee46690a1edf5def9dcd63.tar.bz2 linux-stable-210d8ea82a0bd4ea10ee46690a1edf5def9dcd63.zip | |
Merge branch 'remotes/lorenzo/pci/misc'
- Correct MAINTAINERS typo for NXP LAYERSCAPE GEN4 (Lukas Bulwahn)
- Make PCI endpoint doc section labels unique (Bryce Willey)
* remotes/lorenzo/pci/misc:
Documentation: PCI: Give unique labels to sections
MAINTAINERS: correct typo in new NXP LAYERSCAPE GEN4
| -rw-r--r-- | Documentation/PCI/endpoint/pci-endpoint.rst | 16 | ||||
| -rw-r--r-- | MAINTAINERS | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/PCI/endpoint/pci-endpoint.rst b/Documentation/PCI/endpoint/pci-endpoint.rst index 0e2311b5617b..7536be445db8 100644 --- a/Documentation/PCI/endpoint/pci-endpoint.rst +++ b/Documentation/PCI/endpoint/pci-endpoint.rst @@ -78,8 +78,8 @@ by the PCI controller driver. Cleanup the pci_epc_mem structure allocated during pci_epc_mem_init(). -APIs for the PCI Endpoint Function Driver -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +EPC APIs for the PCI Endpoint Function Driver +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This section lists the APIs that the PCI Endpoint core provides to be used by the PCI endpoint function driver. @@ -117,8 +117,8 @@ by the PCI endpoint function driver. The PCI endpoint function driver should use pci_epc_mem_free_addr() to free the memory space allocated using pci_epc_mem_alloc_addr(). -Other APIs -~~~~~~~~~~ +Other EPC APIs +~~~~~~~~~~~~~~ There are other APIs provided by the EPC library. These are used for binding the EPF device with EPC device. pci-ep-cfs.c can be used as reference for @@ -160,8 +160,8 @@ PCI Endpoint Function(EPF) Library The EPF library provides APIs to be used by the function driver and the EPC library to provide endpoint mode functionality. -APIs for the PCI Endpoint Function Driver -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +EPF APIs for the PCI Endpoint Function Driver +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This section lists the APIs that the PCI Endpoint core provides to be used by the PCI endpoint function driver. @@ -204,8 +204,8 @@ by the PCI endpoint controller library. The PCI endpoint controller library invokes pci_epf_linkup() when the EPC device has established the connection to the host. -Other APIs -~~~~~~~~~~ +Other EPF APIs +~~~~~~~~~~~~~~ There are other APIs provided by the EPF library. These are used to notify the function driver when the EPF device is bound to the EPC device. diff --git a/MAINTAINERS b/MAINTAINERS index 12c0b2fe9c32..59c9859b56d8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12941,7 +12941,7 @@ L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org S: Maintained F: Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt -F: drivers/pci/controller/mobibeil/pcie-layerscape-gen4.c +F: drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c PCI DRIVER FOR RENESAS R-CAR M: Marek Vasut <marek.vasut+renesas@gmail.com> |