Skip to content

Commit 568a67e

Browse files
negglesmmind
authored andcommitted
arm64: dts: rockchip: Fix rk356x PCIe register and range mappings
The register and range mappings for the PCIe controller in Rockchip's RK356x SoCs are incorrect. Replace them with corrected values from the vendor BSP sources, updated to match current DT schema. These values are also used in u-boot. Fixes: 66b51ea ("arm64: dts: rockchip: Add rk3568 PCIe2x1 controller") Cc: stable@vger.kernel.org Signed-off-by: Andrew Powers-Holmes <aholmes@omnom.net> Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Nicolas Frattaroli <frattaroli.nicolas@gmail.com> Tested-by: Diederik de Haas <didi.debian@cknow.org> Link: https://lore.kernel.org/r/20230601132516.153934-1-frattaroli.nicolas@gmail.com Signed-off-by: Heiko Stuebner <heiko@sntech.de>
1 parent 5325593 commit 568a67e

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

arch/arm64/boot/dts/rockchip/rk3568.dtsi

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,10 @@
9494
power-domains = <&power RK3568_PD_PIPE>;
9595
reg = <0x3 0xc0400000 0x0 0x00400000>,
9696
<0x0 0xfe270000 0x0 0x00010000>,
97-
<0x3 0x7f000000 0x0 0x01000000>;
98-
ranges = <0x01000000 0x0 0x3ef00000 0x3 0x7ef00000 0x0 0x00100000>,
99-
<0x02000000 0x0 0x00000000 0x3 0x40000000 0x0 0x3ef00000>;
97+
<0x0 0xf2000000 0x0 0x00100000>;
98+
ranges = <0x01000000 0x0 0xf2100000 0x0 0xf2100000 0x0 0x00100000>,
99+
<0x02000000 0x0 0xf2200000 0x0 0xf2200000 0x0 0x01e00000>,
100+
<0x03000000 0x0 0x40000000 0x3 0x40000000 0x0 0x40000000>;
100101
reg-names = "dbi", "apb", "config";
101102
resets = <&cru SRST_PCIE30X1_POWERUP>;
102103
reset-names = "pipe";
@@ -146,9 +147,10 @@
146147
power-domains = <&power RK3568_PD_PIPE>;
147148
reg = <0x3 0xc0800000 0x0 0x00400000>,
148149
<0x0 0xfe280000 0x0 0x00010000>,
149-
<0x3 0xbf000000 0x0 0x01000000>;
150-
ranges = <0x01000000 0x0 0x3ef00000 0x3 0xbef00000 0x0 0x00100000>,
151-
<0x02000000 0x0 0x00000000 0x3 0x80000000 0x0 0x3ef00000>;
150+
<0x0 0xf0000000 0x0 0x00100000>;
151+
ranges = <0x01000000 0x0 0xf0100000 0x0 0xf0100000 0x0 0x00100000>,
152+
<0x02000000 0x0 0xf0200000 0x0 0xf0200000 0x0 0x01e00000>,
153+
<0x03000000 0x0 0x40000000 0x3 0x80000000 0x0 0x40000000>;
152154
reg-names = "dbi", "apb", "config";
153155
resets = <&cru SRST_PCIE30X2_POWERUP>;
154156
reset-names = "pipe";

arch/arm64/boot/dts/rockchip/rk356x.dtsi

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@
952952
compatible = "rockchip,rk3568-pcie";
953953
reg = <0x3 0xc0000000 0x0 0x00400000>,
954954
<0x0 0xfe260000 0x0 0x00010000>,
955-
<0x3 0x3f000000 0x0 0x01000000>;
955+
<0x0 0xf4000000 0x0 0x00100000>;
956956
reg-names = "dbi", "apb", "config";
957957
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
958958
<GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
@@ -982,8 +982,9 @@
982982
phys = <&combphy2 PHY_TYPE_PCIE>;
983983
phy-names = "pcie-phy";
984984
power-domains = <&power RK3568_PD_PIPE>;
985-
ranges = <0x01000000 0x0 0x3ef00000 0x3 0x3ef00000 0x0 0x00100000
986-
0x02000000 0x0 0x00000000 0x3 0x00000000 0x0 0x3ef00000>;
985+
ranges = <0x01000000 0x0 0xf4100000 0x0 0xf4100000 0x0 0x00100000>,
986+
<0x02000000 0x0 0xf4200000 0x0 0xf4200000 0x0 0x01e00000>,
987+
<0x03000000 0x0 0x40000000 0x3 0x00000000 0x0 0x40000000>;
987988
resets = <&cru SRST_PCIE20_POWERUP>;
988989
reset-names = "pipe";
989990
#address-cells = <3>;

0 commit comments

Comments
 (0)