Skip to content

Commit 8240a9b

Browse files
committed
Merge branch 'pci/controller/rockchip'
- Use dev_err_probe() in dw-rockchip probe error path so the failures aren't silent (Uwe Kleine-König) - Sleep PCIE_T_PVPERL_MS (100ms) before deasserting PERST# (Damien Le Moal) - Sleep PCIE_T_RRS_READY_MS (100ms) after conventional reset, before a config access (Damien Le Moal) - Request the PERST# GPIO with GPIOD_OUT_LOW so it matches the POR value, which avoids a spurious PERST# assertion and fixes a Qcom modem firmware crash and issues with WLAN controllers, e.g., RTL8822CE (Manivannan Sadhasivam for rockchip, Niklas Cassel for dw-rockchip) - Refactor dw-rockchip and add support for Endpoint mode for rk3568 and rk3588 (Niklas Cassel) * pci/controller/rockchip: PCI: dw-rockchip: Use pci_epc_init_notify() directly PCI: dw-rockchip: Add endpoint mode support PCI: dw-rockchip: Refactor the driver to prepare for EP mode PCI: dw-rockchip: Add rockchip_pcie_get_ltssm() helper PCI: dw-rockchip: Fix weird indentation PCI: dw-rockchip: Fix initial PERST# GPIO value PCI: dw-rockchip: Add error messages in .probe() error paths PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio PCI: rockchip-host: Wait 100ms after reset before starting configuration PCI: rockchip-host: Fix rockchip_pcie_host_init_port() PERST# handling
2 parents 59dd704 + 84e30b8 commit 8240a9b

File tree

6 files changed

+322
-44
lines changed

6 files changed

+322
-44
lines changed

drivers/pci/controller/dwc/Kconfig

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,16 +311,30 @@ config PCIE_RCAR_GEN4_EP
311311
SoCs. To compile this driver as a module, choose M here: the module
312312
will be called pcie-rcar-gen4.ko. This uses the DesignWare core.
313313

314+
config PCIE_ROCKCHIP_DW
315+
bool
316+
314317
config PCIE_ROCKCHIP_DW_HOST
315-
bool "Rockchip DesignWare PCIe controller"
316-
select PCIE_DW
317-
select PCIE_DW_HOST
318+
bool "Rockchip DesignWare PCIe controller (host mode)"
318319
depends on PCI_MSI
319320
depends on ARCH_ROCKCHIP || COMPILE_TEST
320321
depends on OF
322+
select PCIE_DW_HOST
323+
select PCIE_ROCKCHIP_DW
324+
help
325+
Enables support for the DesignWare PCIe controller in the
326+
Rockchip SoC (except RK3399) to work in host mode.
327+
328+
config PCIE_ROCKCHIP_DW_EP
329+
bool "Rockchip DesignWare PCIe controller (endpoint mode)"
330+
depends on ARCH_ROCKCHIP || COMPILE_TEST
331+
depends on OF
332+
depends on PCI_ENDPOINT
333+
select PCIE_DW_EP
334+
select PCIE_ROCKCHIP_DW
321335
help
322336
Enables support for the DesignWare PCIe controller in the
323-
Rockchip SoC except RK3399.
337+
Rockchip SoC (except RK3399) to work in endpoint mode.
324338

325339
config PCI_EXYNOS
326340
tristate "Samsung Exynos PCIe controller"

drivers/pci/controller/dwc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o
1616
obj-$(CONFIG_PCIE_QCOM_EP) += pcie-qcom-ep.o
1717
obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o
1818
obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o
19-
obj-$(CONFIG_PCIE_ROCKCHIP_DW_HOST) += pcie-dw-rockchip.o
19+
obj-$(CONFIG_PCIE_ROCKCHIP_DW) += pcie-dw-rockchip.o
2020
obj-$(CONFIG_PCIE_INTEL_GW) += pcie-intel-gw.o
2121
obj-$(CONFIG_PCIE_KEEMBAY) += pcie-keembay.o
2222
obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o

0 commit comments

Comments
 (0)