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

Commit 350a73b4 authored by Simon Horman's avatar Simon Horman
Browse files

PCI: rcar-pcie: Remove Gen2 designation from Kconfig 



It appears that Gen2 is a misnomer for the R-Car PCIE driver
which also supports Gen 1 and Gen 3 SoCs. Accordingly, drop Gen 2
from the help text and Kconfig symbol.

Also, re-arange the Kconfig symbol name to use PCIE as the prefix.
This appears to be in keeping with other PCIE Kconfig symbols.

Reported-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent f55532a0

arch/arm/configs/multi_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ CONFIG_PCI_MSI=y 
CONFIG_PCI_MVEBU=y

CONFIG_PCI_TEGRA=y

CONFIG_PCI_RCAR_GEN2=y

CONFIG_PCI_RCAR_GEN2_PCIE=y

CONFIG_PCIE_RCAR=y

CONFIG_PCIEPORTBUS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=16

arch/arm/configs/shmobile_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ CONFIG_PL310_ERRATA_588369=y 
CONFIG_ARM_ERRATA_754322=y

CONFIG_PCI=y

CONFIG_PCI_RCAR_GEN2=y

CONFIG_PCI_RCAR_GEN2_PCIE=y

CONFIG_PCIE_RCAR=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_HAVE_ARM_ARCH_TIMER=y

arch/arm64/configs/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ CONFIG_ARCH_ZYNQMP=y 
CONFIG_PCI=y

CONFIG_PCI_MSI=y

CONFIG_PCI_IOV=y

CONFIG_PCI_RCAR_GEN2_PCIE=y

CONFIG_PCIE_RCAR=y

CONFIG_PCI_HOST_GENERIC=y

CONFIG_PCI_XGENE=y

CONFIG_PCI_LAYERSCAPE=y

drivers/pci/host/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -69,11 +69,11 @@ config PCI_RCAR_GEN2 
	  There are 3 internal PCI controllers available with a single

	  built-in EHCI/OHCI host controller present on each one.



config PCI_RCAR_GEN2_PCIE

config PCIE_RCAR

	bool "Renesas R-Car PCIe controller"

	depends on ARCH_RENESAS || (ARM && COMPILE_TEST)

	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

	bool

drivers/pci/host/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ obj-$(CONFIG_PCI_HYPERV) += pci-hyperv.o 
obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o

obj-$(CONFIG_PCI_TEGRA) += pci-tegra.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_GENERIC) += pci-host-generic.o

obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o