Re: [PATCH 1/1] arm64: dts: rockchip: rk356x: Fix PCIe register and range mappings

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Please ignore, sent this by mistake. My bad.

On Sat, Nov 12, 2022 at 9:38 PM Andrew Powers-Holmes <aholmes@xxxxxxxxx> wrote:
>
> 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.
>
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Andrew Powers-Holmes <aholmes@xxxxxxxxx>
> ---
>  arch/arm64/boot/dts/rockchip/rk3568.dtsi | 14 ++++++++------
>  arch/arm64/boot/dts/rockchip/rk356x.dtsi |  7 ++++---
>  2 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
> index ba67b58f05b7..c1128d0c4406 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
> @@ -94,9 +94,10 @@ pcie3x1: pcie@fe270000 {
>                 power-domains = <&power RK3568_PD_PIPE>;
>                 reg = <0x3 0xc0400000 0x0 0x00400000>,
>                       <0x0 0xfe270000 0x0 0x00010000>,
> -                     <0x3 0x7f000000 0x0 0x01000000>;
> -               ranges = <0x01000000 0x0 0x3ef00000 0x3 0x7ef00000 0x0 0x00100000>,
> -                        <0x02000000 0x0 0x00000000 0x3 0x40000000 0x0 0x3ef00000>;
> +                     <0x0 0xf2000000 0x0 0x00100000>;
> +               ranges = <0x01000000 0x0 0xf2100000 0x0 0xf2100000 0x0 0x00100000>,
> +                        <0x02000000 0x0 0xf2200000 0x0 0xf2200000 0x0 0x01e00000>,
> +                        <0x03000000 0x0 0x40000000 0x3 0x40000000 0x0 0x40000000>;
>                 reg-names = "dbi", "apb", "config";
>                 resets = <&cru SRST_PCIE30X1_POWERUP>;
>                 reset-names = "pipe";
> @@ -146,9 +147,10 @@ pcie3x2: pcie@fe280000 {
>                 power-domains = <&power RK3568_PD_PIPE>;
>                 reg = <0x3 0xc0800000 0x0 0x00400000>,
>                       <0x0 0xfe280000 0x0 0x00010000>,
> -                     <0x3 0xbf000000 0x0 0x01000000>;
> -               ranges = <0x01000000 0x0 0x3ef00000 0x3 0xbef00000 0x0 0x00100000>,
> -                        <0x02000000 0x0 0x00000000 0x3 0x80000000 0x0 0x3ef00000>;
> +                     <0x0 0xf2000000 0x0 0x01000000>;
> +               ranges = <0x01000000 0x0 0xf0100000 0x0 0xf0100000 0x0 0x00100000>,
> +                        <0x02000000 0x0 0xf0200000 0x0 0xf0200000 0x0 0x01e00000>,
> +                        <0x03000000 0x0 0x40000000 0x3 0x80000000 0x0 0x40000000>;
>                 reg-names = "dbi", "apb", "config";
>                 resets = <&cru SRST_PCIE30X2_POWERUP>;
>                 reset-names = "pipe";
> diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> index 164708f1eb67..eec1d496c617 100644
> --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
> @@ -951,7 +951,7 @@ pcie2x1: pcie@fe260000 {
>                 compatible = "rockchip,rk3568-pcie";
>                 reg = <0x3 0xc0000000 0x0 0x00400000>,
>                       <0x0 0xfe260000 0x0 0x00010000>,
> -                     <0x3 0x3f000000 0x0 0x01000000>;
> +                     <0x0 0xf4000000 0x0 0x00100000>;
>                 reg-names = "dbi", "apb", "config";
>                 interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
>                              <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
> @@ -980,8 +980,9 @@ pcie2x1: pcie@fe260000 {
>                 phys = <&combphy2 PHY_TYPE_PCIE>;
>                 phy-names = "pcie-phy";
>                 power-domains = <&power RK3568_PD_PIPE>;
> -               ranges = <0x01000000 0x0 0x3ef00000 0x3 0x3ef00000 0x0 0x00100000
> -                         0x02000000 0x0 0x00000000 0x3 0x00000000 0x0 0x3ef00000>;
> +               ranges = <0x01000000 0x0 0xf4100000 0x0 0xf4100000 0x0 0x00100000>,
> +                        <0x02000000 0x0 0xf4200000 0x0 0xf4200000 0x0 0x01e00000>,
> +                        <0x03000000 0x0 0x40000000 0x3 0x00000000 0x0 0x40000000>;
>                 resets = <&cru SRST_PCIE20_POWERUP>;
>                 reset-names = "pipe";
>                 #address-cells = <3>;
> --
> 2.38.0
>



[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux