target/linux/bcm27xx/patches-5.4/950-0456-bcm2711-rpi.dtsi-Use-upstream-pcie-node.patch

   1 From 5e9b9f246802f492e7740ab2589aa8c81df5ef20 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Mon, 2 Mar 2020 15:05:25 +0000
   4 Subject: [PATCH] bcm2711-rpi.dtsi: Use upstream pcie node
   5
   6 Now that the upstream bcm2711 DT has a pcie DT node there's no need to
   7 define one downstream.
   8
   9 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  10 ---
  11  arch/arm/boot/dts/bcm2711-rpi-4-b.dts |  2 +-
  12  arch/arm/boot/dts/bcm2711-rpi.dtsi    | 41 ---------------------------
  13  2 files changed, 1 insertion(+), 42 deletions(-)
  14
  15 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  16 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  17 @@ -163,7 +163,7 @@
  18                 i2c6 = &i2c6;
  19                 /delete-property/ ethernet;
  20                 /delete-property/ intc;
  21 -               pcie0 = &pcie_0;
  22 +               pcie0 = &pcie0;
  23         };
  24
  25         /delete-node/ wifi-pwrseq;
  26 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
  27 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
  28 @@ -66,47 +66,6 @@
  29                  <0x0 0x00000000  0x0 0x00000000  0xfc000000>;
  30         dma-ranges = <0x0 0x00000000  0x0 0x00000000  0xfc000000>;
  31
  32 -       pcie_0: pcie@7d500000 {
  33 -               reg = <0x0 0x7d500000 0x9310>,
  34 -                     <0x0 0x7e00f300 0x20>;
  35 -               msi-controller;
  36 -               msi-parent = <&pcie_0>;
  37 -               #address-cells = <3>;
  38 -               #interrupt-cells = <1>;
  39 -               #size-cells = <2>;
  40 -               bus-range = <0x0 0x01>;
  41 -               compatible = "brcm,bcm2711b0-pcie", // Safe value
  42 -                            "brcm,bcm2711-pcie",
  43 -                            "brcm,pci-plat-dev";
  44 -               max-link-speed = <2>;
  45 -               tot-num-pcie = <1>;
  46 -               linux,pci-domain = <0>;
  47 -               interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
  48 -                            <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
  49 -               interrupt-names = "pcie", "msi";
  50 -               interrupt-map-mask = <0x0 0x0 0x0 0x7>;
  51 -               interrupt-map = <0 0 0 1 &gicv2 GIC_SPI 143
  52 -                                       IRQ_TYPE_LEVEL_HIGH
  53 -                                0 0 0 2 &gicv2 GIC_SPI 144
  54 -                                       IRQ_TYPE_LEVEL_HIGH
  55 -                                0 0 0 3 &gicv2 GIC_SPI 145
  56 -                                       IRQ_TYPE_LEVEL_HIGH
  57 -                                0 0 0 4 &gicv2 GIC_SPI 146
  58 -                                       IRQ_TYPE_LEVEL_HIGH>;
  59 -
  60 -               /* Map outbound accesses from scb:0x6_00000000-03ffffff
  61 -                * to pci:0x0_f8000000-fbffffff
  62 -                */
  63 -               ranges = <0x02000000 0x0 0xf8000000  0x6 0x00000000
  64 -                         0x0 0x04000000>;
  65 -               /* Map inbound accesses from pci:0x0_00000000..ffffffff
  66 -                * to scb:0x0_00000000-ffffffff
  67 -                */
  68 -               dma-ranges = <0x02000000 0x0 0x00000000  0x0 0x00000000
  69 -                             0x1 0x00000000>;
  70 -               status = "okay";
  71 -       };
  72 -
  73         dma40: dma@7e007b00 {
  74                 compatible = "brcm,bcm2711-dma";
  75                 reg = <0x0 0x7e007b00 0x400>;