Skip to content

Commit 8eb22dc

Browse files
nxpfranklikhilman
authored andcommitted
Revert "ARM: dts: Update pcie ranges for dra7"
This reverts commit c761028. The commit being reverted updated the "ranges" property for the sake of readability. However, this change is no longer appropriate due to the following reasons: - On many SoCs, the PCIe parent bus translates CPU addresses to different values before passing them to the PCIe controller. - The reverted commit introduced a fake address translation, which violates the fundamental DTS principle: the device tree should reflect actual hardware behavior. Reverting this change prepares for the cleanup of the driver's cpu_addr_fixup() hook. Signed-off-by: Frank Li <Frank.Li@nxp.com> Link: https://lore.kernel.org/r/20250411153454.3258098-1-Frank.Li@nxp.com Signed-off-by: Kevin Hilman <khilman@baylibre.com>
1 parent dccb920 commit 8eb22dc

1 file changed

Lines changed: 11 additions & 18 deletions

File tree

arch/arm/boot/dts/ti/omap/dra7.dtsi

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -195,24 +195,22 @@
195195
clock-names = "fck", "phy-clk", "phy-clk-div";
196196
#size-cells = <1>;
197197
#address-cells = <1>;
198-
ranges = <0x51000000 0x51000000 0x3000>,
199-
<0x20000000 0x20000000 0x10000000>;
198+
ranges = <0x51000000 0x51000000 0x3000
199+
0x0 0x20000000 0x10000000>;
200200
dma-ranges;
201201
/**
202202
* To enable PCI endpoint mode, disable the pcie1_rc
203203
* node and enable pcie1_ep mode.
204204
*/
205205
pcie1_rc: pcie@51000000 {
206-
reg = <0x51000000 0x2000>,
207-
<0x51002000 0x14c>,
208-
<0x20001000 0x2000>;
206+
reg = <0x51000000 0x2000>, <0x51002000 0x14c>, <0x1000 0x2000>;
209207
reg-names = "rc_dbics", "ti_conf", "config";
210208
interrupts = <0 232 0x4>, <0 233 0x4>;
211209
#address-cells = <3>;
212210
#size-cells = <2>;
213211
device_type = "pci";
214-
ranges = <0x81000000 0 0x00000000 0x20003000 0 0x00010000>,
215-
<0x82000000 0 0x20013000 0x20013000 0 0x0ffed000>;
212+
ranges = <0x81000000 0 0 0x03000 0 0x00010000
213+
0x82000000 0 0x20013000 0x13000 0 0xffed000>;
216214
bus-range = <0x00 0xff>;
217215
#interrupt-cells = <1>;
218216
num-lanes = <1>;
@@ -235,10 +233,7 @@
235233
};
236234

237235
pcie1_ep: pcie_ep@51000000 {
238-
reg = <0x51000000 0x28>,
239-
<0x51002000 0x14c>,
240-
<0x51001000 0x28>,
241-
<0x20001000 0x10000000>;
236+
reg = <0x51000000 0x28>, <0x51002000 0x14c>, <0x51001000 0x28>, <0x1000 0x10000000>;
242237
reg-names = "ep_dbics", "ti_conf", "ep_dbics2", "addr_space";
243238
interrupts = <0 232 0x4>;
244239
num-lanes = <1>;
@@ -269,21 +264,19 @@
269264
reset-names = "rstctrl";
270265
#size-cells = <1>;
271266
#address-cells = <1>;
272-
ranges = <0x51800000 0x51800000 0x3000>,
273-
<0x30000000 0x30000000 0x10000000>;
267+
ranges = <0x51800000 0x51800000 0x3000
268+
0x0 0x30000000 0x10000000>;
274269
dma-ranges;
275270
status = "disabled";
276271
pcie2_rc: pcie@51800000 {
277-
reg = <0x51800000 0x2000>,
278-
<0x51802000 0x14c>,
279-
<0x30001000 0x2000>;
272+
reg = <0x51800000 0x2000>, <0x51802000 0x14c>, <0x1000 0x2000>;
280273
reg-names = "rc_dbics", "ti_conf", "config";
281274
interrupts = <0 355 0x4>, <0 356 0x4>;
282275
#address-cells = <3>;
283276
#size-cells = <2>;
284277
device_type = "pci";
285-
ranges = <0x81000000 0 0x00000000 0x30003000 0 0x00010000>,
286-
<0x82000000 0 0x30013000 0x30013000 0 0x0ffed000>;
278+
ranges = <0x81000000 0 0 0x03000 0 0x00010000
279+
0x82000000 0 0x30013000 0x13000 0 0xffed000>;
287280
bus-range = <0x00 0xff>;
288281
#interrupt-cells = <1>;
289282
num-lanes = <1>;

0 commit comments

Comments
 (0)