Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74716ff7 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

Merge branch '6c994c50' 

  - exclude af3c73473d10 ("PCI: Improve host drivers compile test
    coverage") from lorenzo/pci/host/misc to avoid build failure

* commit '6c994c50':
  PCI: v3-semi: Remove unnecessary semicolon
  PCI: rcar: Remove unnecessary semicolon
  PCI: faraday: Make struct faraday_pci_variant static
  PCI: kirin: Make struct kirin_pcie_driver static
  PCI: kirin: Fix missing dependency on PCI_MSI_IRQ_DOMAIN
  PCI: iproc: Remove dependency on ARM specific struct pci_sys_data
  PCI: kirin: Remove unnecessary asm/compiler.h include
  PCI: tegra: Add PCI_MSI_IRQ_DOMAIN kconfig dependency
  PCI: vmd: Fix malformed Kconfig default
parents 14d8d776 6c994c50

drivers/pci/dwc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ config PCIE_ARTPEC6_EP 
config PCIE_KIRIN

	depends on OF && ARM64

	bool "HiSilicon Kirin series SoCs PCIe controllers"

	depends on PCI_MSI_IRQ_DOMAIN

	depends on PCI

	select PCIEPORTBUS

	select PCIE_DW_HOST

drivers/pci/dwc/pcie-kirin.c

+1 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 * Author: Xiaowei Song <songxiaowei@huawei.com>

 */



#include <asm/compiler.h>

#include <linux/compiler.h>

#include <linux/clk.h>

#include <linux/delay.h>
@@ -505,7 +504,7 @@ static const struct of_device_id kirin_pcie_match[] = { 
	{},

};



struct platform_driver kirin_pcie_driver = {

static struct platform_driver kirin_pcie_driver = {

	.probe			= kirin_pcie_probe,

	.driver			= {

		.name			= "kirin-pcie",

drivers/pci/host/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ config PCI_FTPCI100 
config PCI_TEGRA

	bool "NVIDIA Tegra PCIe controller"

	depends on ARCH_TEGRA

	depends on PCI_MSI_IRQ_DOMAIN

	help

	  Say Y here if you want support for the PCIe host controller found

	  on NVIDIA Tegra SoCs.
@@ -215,7 +216,6 @@ config PCIE_TANGO_SMP8759 
config VMD

	depends on PCI_MSI && X86_64 && SRCU

	tristate "Intel Volume Management Device Driver"

	default N

	---help---

	  Adds support for the Intel Volume Management Device (VMD). VMD is a

	  secondary PCI host bridge that allows PCI Express root ports,

drivers/pci/host/pci-ftpci100.c

+2 −2
Original line number Diff line number Diff line
@@ -586,11 +586,11 @@ static int faraday_pci_probe(struct platform_device *pdev) 
 * We encode bridge variants here, we have at least two so it doesn't

 * hurt to have infrastructure to encompass future variants as well.

 */

const struct faraday_pci_variant faraday_regular = {

static const struct faraday_pci_variant faraday_regular = {

	.cascaded_irq = true,

};



const struct faraday_pci_variant faraday_dual = {

static const struct faraday_pci_variant faraday_dual = {

	.cascaded_irq = false,

};

drivers/pci/host/pci-v3-semi.c

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ static int v3_get_dma_range_config(struct v3_pci *v3, 
		dev_err(v3->dev, "illegal dma memory chunk size\n");

		return -EINVAL;

		break;

	};

	}

	val |= V3_PCI_MAP_M_REG_EN | V3_PCI_MAP_M_ENABLE;

	*pci_map = val;