Skip to content

Commit 764fd83

Browse files
committed
Merge branch 'pci/controller/dwc'
- Continue with system suspend even if an Endpoint doesn't respond with PME_TO_Ack message (Manivannan Sadhasivam) - Remove the Baikal-T1 controller driver since it never quite became usable (Andy Shevchenko) - Set Endpoint MSI-X Table Size in the correct function of a multi-function device when configuring MSI-X, not in Function 0 (Aksh Garg) - Set Max Link Width and Max Link Speed for all functions of a multi-function device, not just Function 0 (Aksh Garg) - Clean up in the dw_pcie_resume_noirq() error path (Manivannan Sadhasivam) - Expose PCIe event counters in groups 5-7 in debugfs (Hans Zhang) - Fix type mismatch for kstrtou32_from_user() in debugfs write functions (Hans Zhang) * pci/controller/dwc: PCI: dwc: Fix type mismatch for kstrtou32_from_user() return value PCI: dwc: Expose PCIe event counters for groups 5 to 7 over debugfs PCI: dwc: Perform cleanup in the error path of dw_pcie_resume_noirq() PCI: dwc: ep: Mirror the max link width and speed fields to all functions PCI: dwc: ep: Fix MSI-X Table Size configuration in dw_pcie_ep_set_msix() PCI: dwc: Remove not-going-to-be-supported code for Baikal SoC PCI: dwc: Proceed with system suspend even if the endpoint doesn't respond with PME_TO_Ack message
2 parents 7dde59e + 445588a commit 764fd83

7 files changed

Lines changed: 111 additions & 841 deletions

File tree

Documentation/devicetree/bindings/pci/baikal,bt1-pcie.yaml

Lines changed: 0 additions & 168 deletions
This file was deleted.

drivers/pci/controller/dwc/Kconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,6 @@ config PCIE_ARTPEC6_EP
8484
Enables support for the PCIe controller in the ARTPEC-6 SoC to work in
8585
endpoint mode. This uses the DesignWare core.
8686

87-
config PCIE_BT1
88-
tristate "Baikal-T1 PCIe controller"
89-
depends on MIPS_BAIKAL_T1 || COMPILE_TEST
90-
depends on PCI_MSI
91-
select PCIE_DW_HOST
92-
help
93-
Enables support for the PCIe controller in the Baikal-T1 SoC to work
94-
in host mode. It's based on the Synopsys DWC PCIe v4.60a IP-core.
95-
9687
config PCI_IMX6
9788
bool
9889

drivers/pci/controller/dwc/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ obj-$(CONFIG_PCIE_DW_HOST) += pcie-designware-host.o
55
obj-$(CONFIG_PCIE_DW_EP) += pcie-designware-ep.o
66
obj-$(CONFIG_PCIE_DW_PLAT) += pcie-designware-plat.o
77
obj-$(CONFIG_PCIE_AMD_MDB) += pcie-amd-mdb.o
8-
obj-$(CONFIG_PCIE_BT1) += pcie-bt1.o
98
obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o
109
obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
1110
obj-$(CONFIG_PCIE_FU740) += pcie-fu740.o

0 commit comments

Comments
 (0)