Commit d528c74e authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'renesas-pci-defconfig-for-v4.7' of...

Merge tag 'renesas-pci-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Merge "Renesas ARM Based SoC Pci Defconfig Updates for v4.7" from Simon Horman:

* Remove Gen2 designation from Kconfig for R-Car PCIE driver

* tag 'renesas-pci-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  PCI: rcar-pcie: Remove Gen2 designation from Kconfig
parents 58e696d1 350a73b4
...@@ -119,7 +119,7 @@ CONFIG_PCI_MSI=y ...@@ -119,7 +119,7 @@ CONFIG_PCI_MSI=y
CONFIG_PCI_MVEBU=y CONFIG_PCI_MVEBU=y
CONFIG_PCI_TEGRA=y CONFIG_PCI_TEGRA=y
CONFIG_PCI_RCAR_GEN2=y CONFIG_PCI_RCAR_GEN2=y
CONFIG_PCI_RCAR_GEN2_PCIE=y CONFIG_PCIE_RCAR=y
CONFIG_PCIEPORTBUS=y CONFIG_PCIEPORTBUS=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_NR_CPUS=16 CONFIG_NR_CPUS=16
......
...@@ -24,7 +24,7 @@ CONFIG_PL310_ERRATA_588369=y ...@@ -24,7 +24,7 @@ CONFIG_PL310_ERRATA_588369=y
CONFIG_ARM_ERRATA_754322=y CONFIG_ARM_ERRATA_754322=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_RCAR_GEN2=y CONFIG_PCI_RCAR_GEN2=y
CONFIG_PCI_RCAR_GEN2_PCIE=y CONFIG_PCIE_RCAR=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_SCHED_MC=y CONFIG_SCHED_MC=y
CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_ARCH_TIMER=y
......
...@@ -56,7 +56,7 @@ CONFIG_ARCH_ZYNQMP=y ...@@ -56,7 +56,7 @@ CONFIG_ARCH_ZYNQMP=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_MSI=y CONFIG_PCI_MSI=y
CONFIG_PCI_IOV=y CONFIG_PCI_IOV=y
CONFIG_PCI_RCAR_GEN2_PCIE=y CONFIG_PCIE_RCAR=y
CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_HOST_GENERIC=y
CONFIG_PCI_XGENE=y CONFIG_PCI_XGENE=y
CONFIG_PCI_LAYERSCAPE=y CONFIG_PCI_LAYERSCAPE=y
......
...@@ -69,11 +69,11 @@ config PCI_RCAR_GEN2 ...@@ -69,11 +69,11 @@ config PCI_RCAR_GEN2
There are 3 internal PCI controllers available with a single There are 3 internal PCI controllers available with a single
built-in EHCI/OHCI host controller present on each one. built-in EHCI/OHCI host controller present on each one.
config PCI_RCAR_GEN2_PCIE config PCIE_RCAR
bool "Renesas R-Car PCIe controller" bool "Renesas R-Car PCIe controller"
depends on ARCH_RENESAS || (ARM && COMPILE_TEST) depends on ARCH_RENESAS || (ARM && COMPILE_TEST)
help help
Say Y here if you want PCIe controller support on R-Car Gen2 SoCs. Say Y here if you want PCIe controller support on R-Car SoCs.
config PCI_HOST_COMMON config PCI_HOST_COMMON
bool bool
......
...@@ -7,7 +7,7 @@ obj-$(CONFIG_PCI_HYPERV) += pci-hyperv.o ...@@ -7,7 +7,7 @@ obj-$(CONFIG_PCI_HYPERV) += pci-hyperv.o
obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o
obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o
obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o
obj-$(CONFIG_PCI_RCAR_GEN2_PCIE) += pcie-rcar.o obj-$(CONFIG_PCIE_RCAR) += pcie-rcar.o
obj-$(CONFIG_PCI_HOST_COMMON) += pci-host-common.o obj-$(CONFIG_PCI_HOST_COMMON) += pci-host-common.o
obj-$(CONFIG_PCI_HOST_GENERIC) += pci-host-generic.o obj-$(CONFIG_PCI_HOST_GENERIC) += pci-host-generic.o
obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment