Skip to content

Commit b9c1153

Browse files
liudongdong3bjorn-helgaas
authored andcommitted
PCI: hisi: Fix DT binding (hisi-pcie-almost-ecam)
The "hisilicon,pcie-almost-ecam" binding goes against the usual DT conventions, and is non-sensical in that it describes the IP based on what it isn't. Fix the DT binding with "hisilicon,hip06-pcie-ecam" and "hisilicon,hip07-pcie-ecam". Signed-off-by: Mark Rutland <[email protected]> Signed-off-by: Dongdong Liu <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent 794a860 commit b9c1153

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

Documentation/devicetree/bindings/pci/hisilicon-pcie.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,19 @@ Hip05 Example (note that Hip06 is the same except compatible):
4444
};
4545

4646
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+
4752
The properties and their meanings are identical to those described in
4853
host-generic-pci.txt except as listed below.
4954

5055
Properties of the host controller node that differ from
5156
host-generic-pci.txt:
5257

53-
- compatible : Must be "hisilicon,pcie-almost-ecam"
58+
- compatible : Must be "hisilicon,hip06-pcie-ecam", or
59+
"hisilicon,hip07-pcie-ecam"
5460

5561
- reg : Two entries: First the ECAM configuration space for any
5662
other bus underneath the root bus. Second, the base
@@ -59,7 +65,7 @@ host-generic-pci.txt:
5965

6066
Example:
6167
pcie0: pcie@a0090000 {
62-
compatible = "hisilicon,pcie-almost-ecam";
68+
compatible = "hisilicon,hip06-pcie-ecam";
6369
reg = <0 0xb0000000 0 0x2000000>, /* ECAM configuration space */
6470
<0 0xa0090000 0 0x10000>; /* host bridge registers */
6571
bus-range = <0 31>;

drivers/pci/dwc/pcie-hisi.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,13 @@ struct pci_ecam_ops hisi_pcie_platform_ops = {
380380

381381
static const struct of_device_id hisi_pcie_almost_ecam_of_match[] = {
382382
{
383-
.compatible = "hisilicon,pcie-almost-ecam",
383+
.compatible = "hisilicon,hip06-pcie-ecam",
384384
.data = (void *) &hisi_pcie_platform_ops,
385385
},
386+
{
387+
.compatible = "hisilicon,hip07-pcie-ecam",
388+
.data = (void *) &hisi_pcie_platform_ops,
389+
},
386390
{},
387391
};
388392

0 commit comments

Comments
 (0)