Skip to content

Commit 34b62f1

Browse files
committed
Merge tag 'pci-v6.4-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull pci updates from Bjorn Helgaas: "Resource management: - Add pci_dev_for_each_resource() and pci_bus_for_each_resource() iterators PCIe native device hotplug: - Fix AB-BA deadlock between reset_lock and device_lock Power management: - Wait longer for devices to become ready after resume (as we do for reset) to accommodate Intel Titan Ridge xHCI devices - Extend D3hot delay for NVIDIA HDA controllers to avoid unrecoverable devices after a bus reset Error handling: - Clear PCIe Device Status after EDR since generic error recovery now only clears it when AER is native ASPM: - Work around Chromebook firmware defect that clobbers Capability list (including ASPM L1 PM Substates Cap) when returning from D3cold to D0 Freescale i.MX6 PCIe controller driver: - Install imprecise external abort handler only when DT indicates PCIe support Freescale Layerscape PCIe controller driver: - Add ls1028a endpoint mode support Qualcomm PCIe controller driver: - Add SM8550 DT binding and driver support - Add SDX55 DT binding and driver support - Use bulk APIs for clocks of IP 1.0.0, 2.3.2, 2.3.3 - Use bulk APIs for reset of IP 2.1.0, 2.3.3, 2.4.0 - Add DT "mhi" register region for supported SoCs - Expose link transition counts via debugfs to help debug low power issues - Support system suspend and resume; reduce interconnect bandwidth and turn off clock and PHY if there are no active devices - Enable async probe by default to reduce boot time Miscellaneous: - Sort controller Kconfig entries by vendor" * tag 'pci-v6.4-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci: (56 commits) PCI: xilinx: Drop obsolete dependency on COMPILE_TEST PCI: mobiveil: Sort Kconfig entries by vendor PCI: dwc: Sort Kconfig entries by vendor PCI: Sort controller Kconfig entries by vendor PCI: Use consistent controller Kconfig menu entry language PCI: xilinx-nwl: Add 'Xilinx' to Kconfig prompt PCI: hv: Add 'Microsoft' to Kconfig prompt PCI: meson: Add 'Amlogic' to Kconfig prompt PCI: Use of_property_present() for testing DT property presence PCI/PM: Extend D3hot delay for NVIDIA HDA controllers dt-bindings: PCI: qcom: Document msi-map and msi-map-mask properties PCI: qcom: Add SM8550 PCIe support dt-bindings: PCI: qcom: Add SM8550 compatible PCI: qcom: Add support for SDX55 SoC dt-bindings: PCI: qcom-ep: Fix the unit address used in example dt-bindings: PCI: qcom: Add SDX55 SoC dt-bindings: PCI: qcom: Update maintainers entry PCI: qcom: Enable async probe by default PCI: qcom: Add support for system suspend and resume PCI/PM: Drop pci_bridge_wait_for_secondary_bus() timeout parameter ...
2 parents cb6fe2c + 09a8e5f commit 34b62f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1860
-1682
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@ ForEachMacros:
520520
- 'of_property_for_each_string'
521521
- 'of_property_for_each_u32'
522522
- 'pci_bus_for_each_resource'
523+
- 'pci_dev_for_each_resource'
523524
- 'pci_doe_for_each_off'
524525
- 'pcl_for_each_chunk'
525526
- 'pcl_for_each_segment'
Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pci/amlogic,axg-pcie.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic Meson AXG DWC PCIe SoC controller
8+
9+
maintainers:
10+
- Neil Armstrong <[email protected]>
11+
12+
description:
13+
Amlogic Meson PCIe host controller is based on the Synopsys DesignWare PCI core.
14+
15+
allOf:
16+
- $ref: /schemas/pci/pci-bus.yaml#
17+
- $ref: /schemas/pci/snps,dw-pcie-common.yaml#
18+
19+
# We need a select here so we don't match all nodes with 'snps,dw-pcie'
20+
select:
21+
properties:
22+
compatible:
23+
enum:
24+
- amlogic,axg-pcie
25+
- amlogic,g12a-pcie
26+
required:
27+
- compatible
28+
29+
properties:
30+
compatible:
31+
items:
32+
- enum:
33+
- amlogic,axg-pcie
34+
- amlogic,g12a-pcie
35+
- const: snps,dw-pcie
36+
37+
reg:
38+
items:
39+
- description: External local bus interface registers
40+
- description: Meson designed configuration registers
41+
- description: PCIe configuration space
42+
43+
reg-names:
44+
items:
45+
- const: elbi
46+
- const: cfg
47+
- const: config
48+
49+
interrupts:
50+
maxItems: 1
51+
52+
clocks:
53+
items:
54+
- description: PCIe GEN 100M PLL clock
55+
- description: PCIe RC clock gate
56+
- description: PCIe PHY clock
57+
58+
clock-names:
59+
items:
60+
- const: pclk
61+
- const: port
62+
- const: general
63+
64+
phys:
65+
maxItems: 1
66+
67+
phy-names:
68+
const: pcie
69+
70+
resets:
71+
items:
72+
- description: Port Reset
73+
- description: Shared APB reset
74+
75+
reset-names:
76+
items:
77+
- const: port
78+
- const: apb
79+
80+
num-lanes:
81+
const: 1
82+
83+
power-domains:
84+
maxItems: 1
85+
86+
required:
87+
- compatible
88+
- reg
89+
- reg-names
90+
- interrupts
91+
- clock
92+
- clock-names
93+
- "#address-cells"
94+
- "#size-cells"
95+
- "#interrupt-cells"
96+
- interrupt-map
97+
- interrupt-map-mask
98+
- ranges
99+
- bus-range
100+
- device_type
101+
- num-lanes
102+
- phys
103+
- phy-names
104+
- resets
105+
- reset-names
106+
107+
unevaluatedProperties: false
108+
109+
examples:
110+
- |
111+
#include <dt-bindings/interrupt-controller/irq.h>
112+
#include <dt-bindings/interrupt-controller/arm-gic.h>
113+
pcie: pcie@f9800000 {
114+
compatible = "amlogic,axg-pcie", "snps,dw-pcie";
115+
reg = <0xf9800000 0x400000>, <0xff646000 0x2000>, <0xf9f00000 0x100000>;
116+
reg-names = "elbi", "cfg", "config";
117+
interrupts = <GIC_SPI 177 IRQ_TYPE_EDGE_RISING>;
118+
clocks = <&pclk>, <&clk_port>, <&clk_phy>;
119+
clock-names = "pclk", "port", "general";
120+
resets = <&reset_pcie_port>, <&reset_pcie_apb>;
121+
reset-names = "port", "apb";
122+
phys = <&pcie_phy>;
123+
phy-names = "pcie";
124+
#interrupt-cells = <1>;
125+
interrupt-map-mask = <0 0 0 0>;
126+
interrupt-map = <0 0 0 0 &gic GIC_SPI 179 IRQ_TYPE_EDGE_RISING>;
127+
bus-range = <0x0 0xff>;
128+
#address-cells = <3>;
129+
#size-cells = <2>;
130+
device_type = "pci";
131+
num-lanes = <1>;
132+
ranges = <0x82000000 0 0 0xf9c00000 0 0x00300000>;
133+
};
134+
...

Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt

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

0 commit comments

Comments
 (0)