Commit e60cb06c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v5.13-rockchip-dtsfixes1' of... 

Merge tag 'v5.13-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes

Fix PCIe address ranges that are affected by recent PCI changes.
There are 3 additional patches pending that handle the backward
compatiblity inside the PCI subsystem, but the address ranges
should be fixed anyway.

* tag 'v5.13-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Update RK3399 PCI host bridge window to 32-bit address memory

Link: https://lore.kernel.org/r/3405741.0S5aU1g85B@diego


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 37c2a429 8efe01b4

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

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ pcie0: pcie@f8000000 { 
		       <&pcie_phy 2>, <&pcie_phy 3>;

		phy-names = "pcie-phy-0", "pcie-phy-1",

			    "pcie-phy-2", "pcie-phy-3";

		ranges = <0x83000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x1e00000>,

		ranges = <0x82000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x1e00000>,

			 <0x81000000 0x0 0xfbe00000 0x0 0xfbe00000 0x0 0x100000>;

		resets = <&cru SRST_PCIE_CORE>, <&cru SRST_PCIE_MGMT>,

			 <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>,