Skip to content

Commit c13c823

Browse files
robherringmmind
authored andcommitted
arm64: dts: rockchip: Fix PCI node addresses on rk3399-gru
The rk3399-gru PCI node addresses are wrong. In rk3399-gru-scarlet, the bus number in the address should be 0. This is because bus number assignment is dynamic and not known up front. For FDT, the bus number is simply ignored. In rk3399-gru-chromebook, the addresses are simply invalid. The first "reg" entry must be the configuration space for the device. The entry should be all 0s except for device/slot and function numbers. The existing 64-bit memory space (0x83000000) entries are not valid because they must have the BAR address in the lower byte of the first cell. Warnings for these are enabled by adding the missing 'device_type = "pci"' for the root port node. Signed-off-by: Rob Herring <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Stuebner <[email protected]>
1 parent 815f986 commit c13c823

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,7 @@ ap_i2c_tp: &i2c5 {
509509
&pci_rootport {
510510
mvl_wifi: wifi@0,0 {
511511
compatible = "pci1b4b,2b42";
512-
reg = <0x83010000 0x0 0x00000000 0x0 0x00100000
513-
0x83010000 0x0 0x00100000 0x0 0x00100000>;
512+
reg = <0x0000 0x0 0x0 0x0 0x0>;
514513
interrupt-parent = <&gpio0>;
515514
interrupts = <8 IRQ_TYPE_LEVEL_LOW>;
516515
pinctrl-names = "default";

arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
&pci_rootport {
3535
wifi@0,0 {
3636
compatible = "qcom,ath10k";
37-
reg = <0x00010000 0x0 0x00000000 0x0 0x00000000>,
38-
<0x03010010 0x0 0x00000000 0x0 0x00200000>;
37+
reg = <0x00000000 0x0 0x00000000 0x0 0x00000000>,
38+
<0x03000010 0x0 0x00000000 0x0 0x00200000>;
3939
qcom,ath10k-calibration-variant = "GO_DUMO";
4040
};
4141
};

arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ ap_i2c_audio: &i2c8 {
489489
#address-cells = <3>;
490490
#size-cells = <2>;
491491
ranges;
492+
device_type = "pci";
492493
};
493494
};
494495

0 commit comments

Comments
 (0)