Commit 61d02c37 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/brcmstb' 

  - Add brcmstb PCIe bindings for Raspberry Pi 4 (Jim Quinlan)

  - Add Broadcom STB PCIe host controller driver (Jim Quinlan)

  - Add MSI support for Broadcom STB PCIe host controller driver (Jim
    Quinlan)

* remotes/lorenzo/pci/brcmstb:
  PCI: brcmstb: Add MSI support
  PCI: brcmstb: Add Broadcom STB PCIe host controller driver
  dt-bindings: PCI: Add bindings for brcmstb's PCIe device
parents db83c269 40ca1bf5

Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml

0 → 100644
+97 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/pci/brcm,stb-pcie.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Brcmstb PCIe Host Controller Device Tree Bindings



maintainers:

  - Nicolas Saenz Julienne <nsaenzjulienne@suse.de>



allOf:

  - $ref: /schemas/pci/pci-bus.yaml#



properties:

  compatible:

    const: brcm,bcm2711-pcie # The Raspberry Pi 4



  reg:

    maxItems: 1



  interrupts:

    minItems: 1

    maxItems: 2

    items:

      - description: PCIe host controller

      - description: builtin MSI controller



  interrupt-names:

    minItems: 1

    maxItems: 2

    items:

      - const: pcie

      - const: msi



  ranges:

    maxItems: 1



  dma-ranges:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-names:

    items:

      - const: sw_pcie



  msi-controller:

    description: Identifies the node as an MSI controller.



  msi-parent:

    description: MSI controller the device is capable of using.



  brcm,enable-ssc:

    description: Indicates usage of spread-spectrum clocking.

    type: boolean



required:

  - reg

  - dma-ranges

  - "#interrupt-cells"

  - interrupts

  - interrupt-names

  - interrupt-map-mask

  - interrupt-map

  - msi-controller



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>



    scb {

            #address-cells = <2>;

            #size-cells = <1>;

            pcie0: pcie@7d500000 {

                    compatible = "brcm,bcm2711-pcie";

                    reg = <0x0 0x7d500000 0x9310>;

                    device_type = "pci";

                    #address-cells = <3>;

                    #size-cells = <2>;

                    #interrupt-cells = <1>;

                    interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,

                                 <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;

                    interrupt-names = "pcie", "msi";

                    interrupt-map-mask = <0x0 0x0 0x0 0x7>;

                    interrupt-map = <0 0 0 1 &gicv2 GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;

                    msi-parent = <&pcie0>;

                    msi-controller;

                    ranges = <0x02000000 0x0 0xf8000000 0x6 0x00000000 0x0 0x04000000>;

                    dma-ranges = <0x02000000 0x0 0x00000000 0x0 0x00000000 0x0 0x80000000>;

                    brcm,enable-ssc;

            };

    };

drivers/pci/controller/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -252,6 +252,15 @@ config VMD 
	  To compile this driver as a module, choose M here: the

	  module will be called vmd.



config PCIE_BRCMSTB

	tristate "Broadcom Brcmstb PCIe host controller"

	depends on ARCH_BCM2835 || COMPILE_TEST

	depends on OF

	depends on PCI_MSI_IRQ_DOMAIN

	help

	  Say Y here to enable PCIe host controller support for

	  Broadcom STB based SoCs, like the Raspberry Pi 4.



config PCI_HYPERV_INTERFACE

	tristate "Hyper-V PCI Interface"

	depends on X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && X86_64

drivers/pci/controller/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o 
obj-$(CONFIG_PCIE_MOBIVEIL) += pcie-mobiveil.o

obj-$(CONFIG_PCIE_TANGO_SMP8759) += pcie-tango.o

obj-$(CONFIG_VMD) += vmd.o

obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o

# pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW

obj-y				+= dwc/

drivers/pci/controller/pcie-brcmstb.c

0 → 100644
+1015 −0

File added.

Preview size limit exceeded, changes collapsed.