Skip to content

Commit fc23af0

Browse files
bjorn-helgaasbjorn-helgaas
committed
Merge branch 'remotes/lorenzo/pci/keystone'
 - Quirk Keystone K2G to limit MRRS to 256 (Kishon Vijay Abraham I) - Update Keystone to use MRRS quirk for host bridge instead of open coding (Kishon Vijay Abraham I) - Refactor Keystone link establishment (Kishon Vijay Abraham I) - Simplify and speed up Keystone link training (Kishon Vijay Abraham I) - Remove unused Keystone host_init argument (Kishon Vijay Abraham I) - Merge Keystone driver files into one (Kishon Vijay Abraham I) - Remove redundant Keystone platform_set_drvdata() (Kishon Vijay Abraham I) - Rename Keystone functions for uniformity (Kishon Vijay Abraham I) - Add Keystone device control module DT binding (Kishon Vijay Abraham I) - Use SYSCON API to get Keystone control module device IDs (Kishon Vijay Abraham I) - Clean up Keystone PHY handling (Kishon Vijay Abraham I) - Use runtime PM APIs to enable Keystone clock (Kishon Vijay Abraham I) - Clean up Keystone config space access checks (Kishon Vijay Abraham I) - Get Keystone outbound window count from DT (Kishon Vijay Abraham I) - Clean up Keystone outbound window configuration (Kishon Vijay Abraham I) - Clean up Keystone DBI setup (Kishon Vijay Abraham I) - Clean up Keystone ks_pcie_link_up() (Kishon Vijay Abraham I) - Fix Keystone IRQ status checking (Kishon Vijay Abraham I) - Add debug messages for all Keystone errors (Kishon Vijay Abraham I) - Clean up Keystone includes and macros (Kishon Vijay Abraham I) * remotes/lorenzo/pci/keystone: PCI: keystone: Cleanup macros defined in pci-keystone.c PCI: keystone: Reorder header file in alphabetical order PCI: keystone: Add debug error message for all errors PCI: keystone: Use ERR_IRQ_STATUS instead of ERR_IRQ_STATUS_RAW to get interrupt status PCI: keystone: Cleanup ks_pcie_link_up() PCI: keystone: Cleanup set_dbi_mode() and get_dbi_mode() PCI: keystone: Cleanup outbound window configuration PCI: keystone: Get number of outbound windows from DT PCI: keystone: Cleanup configuration space access PCI: keystone: Invoke runtime PM APIs to enable clock PCI: keystone: Cleanup PHY handling PCI: keystone: Use SYSCON APIs to get device ID from control module dt-bindings: PCI: keystone: Add bindings to get device control module PCI: keystone: Use uniform function naming convention PCI: keystone: Remove redundant platform_set_drvdata() invocation PCI: keystone: Merge pci-keystone-dw.c and pci-keystone.c PCI: keystone: Remove unused argument from ks_dw_pcie_host_init() PCI: keystone: Do not initiate link training multiple times PCI: keystone: Move dw_pcie_setup_rc() out of ks_pcie_establish_link() PCI: keystone: Use quirk to set MRRS for PCI host bridge PCI: keystone: Use quirk to limit MRRS for K2G
2 parents deab1f2 + 261de72 commit fc23af0

File tree

7 files changed

+686
-654
lines changed

7 files changed

+686
-654
lines changed

‎Documentation/devicetree/bindings/pci/pci-keystone.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ pcie_msi_intc : Interrupt controller device node for MSI IRQ chip
1919
interrupt-cells: should be set to 1
2020
interrupts: GIC interrupt lines connected to PCI MSI interrupt lines
2121

22+
ti,syscon-pcie-id : phandle to the device control module required to set device
23+
id and vendor id.
24+
2225
Example:
2326
pcie_msi_intc: msi-interrupt-controller {
2427
interrupt-controller;

‎MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11189,7 +11189,7 @@ M: Murali Karicheri <m-karicheri2@ti.com>
1118911189
L: linux-pci@vger.kernel.org
1119011190
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1119111191
S: Maintained
11192-
F: drivers/pci/controller/dwc/*keystone*
11192+
F: drivers/pci/controller/dwc/pci-keystone.c
1119311193

1119411194
PCI ENDPOINT SUBSYSTEM
1119511195
M: Kishon Vijay Abraham I <kishon@ti.com>

‎drivers/pci/controller/dwc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o
77
obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
88
obj-$(CONFIG_PCI_IMX6) += pci-imx6.o
99
obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o
10-
obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone-dw.o pci-keystone.o
10+
obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone.o
1111
obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o
1212
obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o
1313
obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o

0 commit comments

Comments
 (0)