Skip to content

Commit c5f62d3

Browse files
committed
Merge branch 'pci/host/brcmstb'
- Declare bitmap correctly for use by bitmap interfaces (Christophe JAILLET) - Clean up computation of legacy and non-legacy MSI bitmasks (Florian Fainelli) - Update suspend/resume/remove error handling to warn about errors and not fail the operation (Jim Quinlan) - Correct the "pcie" and "msi" interrupt descriptions in DT binding (Jim Quinlan) - Add DT bindings for endpoint voltage regulators (Jim Quinlan) - Split brcm_pcie_setup() into two functions (Jim Quinlan) - Add mechanism for turning on voltage regulators for connected devices (Jim Quinlan) - Turn voltage regulators for connected devices on/off when bus is added or removed (Jim Quinlan) - When suspending, don't turn off voltage regulators for wakeup devices (Jim Quinlan) * pci/host/brcmstb: PCI: brcmstb: Do not turn off WOL regulators on suspend PCI: brcmstb: Add control of subdevice voltage regulators PCI: brcmstb: Add mechanism to turn on subdev regulators PCI: brcmstb: Split brcm_pcie_setup() into two funcs dt-bindings: PCI: Add bindings for Brcmstb EP voltage regulators dt-bindings: PCI: Correct brcmstb interrupts, interrupt-map. PCI: brcmstb: Fix function return value handling PCI: brcmstb: Do not use __GENMASK PCI: brcmstb: Declare 'used' as bitmap, not unsigned long
2 parents 3164f27 + 11ed8b8 commit c5f62d3

File tree

2 files changed

+288
-43
lines changed

2 files changed

+288
-43
lines changed

Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,17 +143,40 @@ examples:
143143
#address-cells = <3>;
144144
#size-cells = <2>;
145145
#interrupt-cells = <1>;
146-
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
146+
interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,
147147
<GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
148148
interrupt-names = "pcie", "msi";
149149
interrupt-map-mask = <0x0 0x0 0x0 0x7>;
150-
interrupt-map = <0 0 0 1 &gicv2 GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
150+
interrupt-map = <0 0 0 1 &gicv2 GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH
151+
0 0 0 2 &gicv2 GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH
152+
0 0 0 3 &gicv2 GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH
153+
0 0 0 4 &gicv2 GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
154+
151155
msi-parent = <&pcie0>;
152156
msi-controller;
153157
ranges = <0x02000000 0x0 0xf8000000 0x6 0x00000000 0x0 0x04000000>;
154158
dma-ranges = <0x42000000 0x1 0x00000000 0x0 0x40000000 0x0 0x80000000>,
155159
<0x42000000 0x1 0x80000000 0x3 0x00000000 0x0 0x80000000>;
156160
brcm,enable-ssc;
157161
brcm,scb-sizes = <0x0000000080000000 0x0000000080000000>;
162+
163+
/* PCIe bridge, Root Port */
164+
pci@0,0 {
165+
#address-cells = <3>;
166+
#size-cells = <2>;
167+
reg = <0x0 0x0 0x0 0x0 0x0>;
168+
compatible = "pciclass,0604";
169+
device_type = "pci";
170+
vpcie3v3-supply = <&vreg7>;
171+
ranges;
172+
173+
/* PCIe endpoint */
174+
pci-ep@0,0 {
175+
assigned-addresses =
176+
<0x82010000 0x0 0xf8000000 0x6 0x00000000 0x0 0x2000>;
177+
reg = <0x0 0x0 0x0 0x0 0x0>;
178+
compatible = "pci14e4,1688";
179+
};
180+
};
158181
};
159182
};

0 commit comments

Comments
 (0)