diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2019-01-02 16:31:10 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-01-02 16:31:10 -0500 |
commit | c266b026ae7a51f876eb74e15ff63f834fe35976 (patch) | |
tree | 13aef10bb1f415b39b971760d0d17c2c56612611 /Documentation | |
parent | c8778707c23a906576c1fdb40dd6ba4090c11773 (diff) | |
parent | 41c5c5b0e7c8a0fd03722f2b061e1d492e359d45 (diff) |
Merge branch 'remotes/lorenzo/pci/mediatek'
- Use devm resource parser in mediatek (Honghui Zhang)
- Remove unused mediatek "num-lanes" DT property (Honghui Zhang)
* remotes/lorenzo/pci/mediatek:
arm64: dts: mt7622: Remove un-used property for PCIe
arm: dts: mt7623: Remove un-used property for PCIe
dt-bindings: PCI: MediaTek: Remove un-used property
PCI: mediatek: Remove un-used variant in struct mtk_pcie_port
PCI: mediatek: Use devm_of_pci_get_host_bridge_resources() to parse DT
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/pci/mediatek-pcie.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/devicetree/bindings/pci/mediatek-pcie.txt b/Documentation/devicetree/bindings/pci/mediatek-pcie.txt index 20227a875ac8..92437a366e5f 100644 --- a/Documentation/devicetree/bindings/pci/mediatek-pcie.txt +++ b/Documentation/devicetree/bindings/pci/mediatek-pcie.txt | |||
@@ -65,7 +65,6 @@ Required properties: | |||
65 | explanation. | 65 | explanation. |
66 | - ranges: Sub-ranges distributed from the PCIe controller node. An empty | 66 | - ranges: Sub-ranges distributed from the PCIe controller node. An empty |
67 | property is sufficient. | 67 | property is sufficient. |
68 | - num-lanes: Number of lanes to use for this port. | ||
69 | 68 | ||
70 | Examples for MT7623: | 69 | Examples for MT7623: |
71 | 70 | ||
@@ -118,7 +117,6 @@ Examples for MT7623: | |||
118 | interrupt-map-mask = <0 0 0 0>; | 117 | interrupt-map-mask = <0 0 0 0>; |
119 | interrupt-map = <0 0 0 0 &sysirq GIC_SPI 193 IRQ_TYPE_LEVEL_LOW>; | 118 | interrupt-map = <0 0 0 0 &sysirq GIC_SPI 193 IRQ_TYPE_LEVEL_LOW>; |
120 | ranges; | 119 | ranges; |
121 | num-lanes = <1>; | ||
122 | }; | 120 | }; |
123 | 121 | ||
124 | pcie@1,0 { | 122 | pcie@1,0 { |
@@ -129,7 +127,6 @@ Examples for MT7623: | |||
129 | interrupt-map-mask = <0 0 0 0>; | 127 | interrupt-map-mask = <0 0 0 0>; |
130 | interrupt-map = <0 0 0 0 &sysirq GIC_SPI 194 IRQ_TYPE_LEVEL_LOW>; | 128 | interrupt-map = <0 0 0 0 &sysirq GIC_SPI 194 IRQ_TYPE_LEVEL_LOW>; |
131 | ranges; | 129 | ranges; |
132 | num-lanes = <1>; | ||
133 | }; | 130 | }; |
134 | 131 | ||
135 | pcie@2,0 { | 132 | pcie@2,0 { |
@@ -140,7 +137,6 @@ Examples for MT7623: | |||
140 | interrupt-map-mask = <0 0 0 0>; | 137 | interrupt-map-mask = <0 0 0 0>; |
141 | interrupt-map = <0 0 0 0 &sysirq GIC_SPI 195 IRQ_TYPE_LEVEL_LOW>; | 138 | interrupt-map = <0 0 0 0 &sysirq GIC_SPI 195 IRQ_TYPE_LEVEL_LOW>; |
142 | ranges; | 139 | ranges; |
143 | num-lanes = <1>; | ||
144 | }; | 140 | }; |
145 | }; | 141 | }; |
146 | 142 | ||
@@ -172,7 +168,6 @@ Examples for MT2712: | |||
172 | #size-cells = <2>; | 168 | #size-cells = <2>; |
173 | #interrupt-cells = <1>; | 169 | #interrupt-cells = <1>; |
174 | ranges; | 170 | ranges; |
175 | num-lanes = <1>; | ||
176 | interrupt-map-mask = <0 0 0 7>; | 171 | interrupt-map-mask = <0 0 0 7>; |
177 | interrupt-map = <0 0 0 1 &pcie_intc0 0>, | 172 | interrupt-map = <0 0 0 1 &pcie_intc0 0>, |
178 | <0 0 0 2 &pcie_intc0 1>, | 173 | <0 0 0 2 &pcie_intc0 1>, |
@@ -191,7 +186,6 @@ Examples for MT2712: | |||
191 | #size-cells = <2>; | 186 | #size-cells = <2>; |
192 | #interrupt-cells = <1>; | 187 | #interrupt-cells = <1>; |
193 | ranges; | 188 | ranges; |
194 | num-lanes = <1>; | ||
195 | interrupt-map-mask = <0 0 0 7>; | 189 | interrupt-map-mask = <0 0 0 7>; |
196 | interrupt-map = <0 0 0 1 &pcie_intc1 0>, | 190 | interrupt-map = <0 0 0 1 &pcie_intc1 0>, |
197 | <0 0 0 2 &pcie_intc1 1>, | 191 | <0 0 0 2 &pcie_intc1 1>, |
@@ -245,7 +239,6 @@ Examples for MT7622: | |||
245 | #size-cells = <2>; | 239 | #size-cells = <2>; |
246 | #interrupt-cells = <1>; | 240 | #interrupt-cells = <1>; |
247 | ranges; | 241 | ranges; |
248 | num-lanes = <1>; | ||
249 | interrupt-map-mask = <0 0 0 7>; | 242 | interrupt-map-mask = <0 0 0 7>; |
250 | interrupt-map = <0 0 0 1 &pcie_intc0 0>, | 243 | interrupt-map = <0 0 0 1 &pcie_intc0 0>, |
251 | <0 0 0 2 &pcie_intc0 1>, | 244 | <0 0 0 2 &pcie_intc0 1>, |
@@ -264,7 +257,6 @@ Examples for MT7622: | |||
264 | #size-cells = <2>; | 257 | #size-cells = <2>; |
265 | #interrupt-cells = <1>; | 258 | #interrupt-cells = <1>; |
266 | ranges; | 259 | ranges; |
267 | num-lanes = <1>; | ||
268 | interrupt-map-mask = <0 0 0 7>; | 260 | interrupt-map-mask = <0 0 0 7>; |
269 | interrupt-map = <0 0 0 1 &pcie_intc1 0>, | 261 | interrupt-map = <0 0 0 1 &pcie_intc1 0>, |
270 | <0 0 0 2 &pcie_intc1 1>, | 262 | <0 0 0 2 &pcie_intc1 1>, |