Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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)
+13
-3
+8
-2
Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
+8
-2
Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
···
44
44
};
45
45
46
46
HiSilicon Hip06/Hip07 PCIe host bridge DT (almost-ECAM) description.
47
+
48
+
Some BIOSes place the host controller in a mode where it is ECAM
49
+
compliant for all devices other than the root complex. In such cases,
50
+
the host controller should be described as below.
51
+
47
52
The properties and their meanings are identical to those described in
48
53
host-generic-pci.txt except as listed below.
49
54
50
55
Properties of the host controller node that differ from
51
56
host-generic-pci.txt:
52
57
53
-
- compatible : Must be "hisilicon,pcie-almost-ecam"
58
+
- compatible : Must be "hisilicon,hip06-pcie-ecam", or
59
+
"hisilicon,hip07-pcie-ecam"
54
60
55
61
- reg : Two entries: First the ECAM configuration space for any
56
62
other bus underneath the root bus. Second, the base
···
65
59
66
60
Example:
67
61
pcie0: pcie@a0090000 {
68
-
compatible = "hisilicon,pcie-almost-ecam";
62
+
compatible = "hisilicon,hip06-pcie-ecam";
69
63
reg = <0 0xb0000000 0 0x2000000>, /* ECAM configuration space */
70
64
<0 0xa0090000 0 0x10000>; /* host bridge registers */
71
65
bus-range = <0 31>;
+5
-1
drivers/pci/dwc/pcie-hisi.c
+5
-1
drivers/pci/dwc/pcie-hisi.c
···
380
380
381
381
static const struct of_device_id hisi_pcie_almost_ecam_of_match[] = {
382
382
{
383
-
.compatible = "hisilicon,pcie-almost-ecam",
383
+
.compatible = "hisilicon,hip06-pcie-ecam",
384
384
.data = (void *) &hisi_pcie_platform_ops,
385
+
},
386
+
{
387
+
.compatible = "hisilicon,hip07-pcie-ecam",
388
+
.data = (void *) &hisi_pcie_platform_ops,
385
389
},
386
390
{},
387
391
};