Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe7ba289 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

+8 −2
Original line number Diff line number Diff line
@@ -44,13 +44,19 @@ Hip05 Example (note that Hip06 is the same except compatible): 
	};



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

host-generic-pci.txt except as listed below.



Properties of the host controller node that differ from

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

		   other bus underneath the root bus. Second, the base
@@ -59,7 +65,7 @@ host-generic-pci.txt: 


Example:

	pcie0: pcie@a0090000 {

		compatible = "hisilicon,pcie-almost-ecam";

		compatible = "hisilicon,hip06-pcie-ecam";

		reg = <0 0xb0000000 0 0x2000000>,  /*  ECAM configuration space */

		      <0 0xa0090000 0 0x10000>; /* host bridge registers */

		bus-range = <0  31>;

drivers/pci/dwc/pcie-hisi.c

+5 −1
Original line number Diff line number Diff line
@@ -380,7 +380,11 @@ struct pci_ecam_ops hisi_pcie_platform_ops = { 


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,

	},

	{

		.compatible =  "hisilicon,hip07-pcie-ecam",

		.data       = (void *) &hisi_pcie_platform_ops,

	},

	{},