Commit 187b8115 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/rcar-gen4' 

- Make the read-only const array 'check_addr' static (Colin Ian King)

- Add R-Car V4M (R8A779H0) PCIe host and endpoint to DT binding (Yoshihiro
  Shimoda)

* pci/controller/rcar-gen4:
  dt-bindings: PCI: rcar-gen4-pci-ep: Add R-Car V4M compatible
  dt-bindings: PCI: rcar-gen4-pci-host: Add R-Car V4M compatible
  PCI: rcar-gen4: Make read-only const array check_addr static
parents 45e981b8 05a01639

Documentation/devicetree/bindings/pci/rcar-gen4-pci-ep.yaml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
      - enum:

          - renesas,r8a779f0-pcie-ep      # R-Car S4-8

          - renesas,r8a779g0-pcie-ep      # R-Car V4H

          - renesas,r8a779h0-pcie-ep      # R-Car V4M

      - const: renesas,rcar-gen4-pcie-ep  # R-Car Gen4



  reg:

Documentation/devicetree/bindings/pci/rcar-gen4-pci-host.yaml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
      - enum:

          - renesas,r8a779f0-pcie      # R-Car S4-8

          - renesas,r8a779g0-pcie      # R-Car V4H

          - renesas,r8a779h0-pcie      # R-Car V4M

      - const: renesas,rcar-gen4-pcie  # R-Car Gen4



  reg:

drivers/pci/controller/dwc/pcie-rcar-gen4.c

+6 −1
Original line number Diff line number Diff line
@@ -606,7 +606,12 @@ static int rcar_gen4_pcie_reg_test_bit(struct rcar_gen4_pcie *rcar, 
static int rcar_gen4_pcie_download_phy_firmware(struct rcar_gen4_pcie *rcar)

{

	/* The check_addr values are magical numbers in the datasheet */

	const u32 check_addr[] = { 0x00101018, 0x00101118, 0x00101021, 0x00101121};

	static const u32 check_addr[] = {

		0x00101018,

		0x00101118,

		0x00101021,

		0x00101121,

	};

	struct dw_pcie *dw = &rcar->dw;

	const struct firmware *fw;

	unsigned int i, timeout;