Commit fe7ba289 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pci-v4.11-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas:
 "Sorry this is so late. It's been in -next for over a week, but I
  forgot to send it on until now.

  A single fix to the DT binding of the HiSilicon PCIe host support"

* tag 'pci-v4.11-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: hisi: Fix DT binding (hisi-pcie-almost-ecam)
parents a9aa1908 b9c1153f
...@@ -44,13 +44,19 @@ Hip05 Example (note that Hip06 is the same except compatible): ...@@ -44,13 +44,19 @@ Hip05 Example (note that Hip06 is the same except compatible):
}; };
HiSilicon Hip06/Hip07 PCIe host bridge DT (almost-ECAM) description. HiSilicon Hip06/Hip07 PCIe host bridge DT (almost-ECAM) description.
Some BIOSes place the host controller in a mode where it is ECAM
compliant for all devices other than the root complex. In such cases,
the host controller should be described as below.
The properties and their meanings are identical to those described in The properties and their meanings are identical to those described in
host-generic-pci.txt except as listed below. host-generic-pci.txt except as listed below.
Properties of the host controller node that differ from Properties of the host controller node that differ from
host-generic-pci.txt: host-generic-pci.txt:
- compatible : Must be "hisilicon,pcie-almost-ecam" - compatible : Must be "hisilicon,hip06-pcie-ecam", or
"hisilicon,hip07-pcie-ecam"
- reg : Two entries: First the ECAM configuration space for any - reg : Two entries: First the ECAM configuration space for any
other bus underneath the root bus. Second, the base other bus underneath the root bus. Second, the base
...@@ -59,7 +65,7 @@ host-generic-pci.txt: ...@@ -59,7 +65,7 @@ host-generic-pci.txt:
Example: Example:
pcie0: pcie@a0090000 { pcie0: pcie@a0090000 {
compatible = "hisilicon,pcie-almost-ecam"; compatible = "hisilicon,hip06-pcie-ecam";
reg = <0 0xb0000000 0 0x2000000>, /* ECAM configuration space */ reg = <0 0xb0000000 0 0x2000000>, /* ECAM configuration space */
<0 0xa0090000 0 0x10000>; /* host bridge registers */ <0 0xa0090000 0 0x10000>; /* host bridge registers */
bus-range = <0 31>; bus-range = <0 31>;
......
...@@ -380,9 +380,13 @@ struct pci_ecam_ops hisi_pcie_platform_ops = { ...@@ -380,9 +380,13 @@ struct pci_ecam_ops hisi_pcie_platform_ops = {
static const struct of_device_id hisi_pcie_almost_ecam_of_match[] = { static const struct of_device_id hisi_pcie_almost_ecam_of_match[] = {
{ {
.compatible = "hisilicon,pcie-almost-ecam", .compatible = "hisilicon,hip06-pcie-ecam",
.data = (void *) &hisi_pcie_platform_ops, .data = (void *) &hisi_pcie_platform_ops,
}, },
{
.compatible = "hisilicon,hip07-pcie-ecam",
.data = (void *) &hisi_pcie_platform_ops,
},
{}, {},
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment