UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renesas ARM Based SoC Pci Defconfig Updates for v4.7 

* Remove Gen2 designation from Kconfig for R-Car PCIE driver
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXHrmwAAoJENfPZGlqN0++PKUP/R5UOgaOGbsUJRCKmk2JVEvO
 8bpPOfYY2vbgR8ZSRPb/7svHyUztjbi3FdyvvCAzOli+pFLLUxd87mkK83te3uRJ
 Aw3kBUVo+I7STtrvKpGThQ7BoDslhn8BolsmXAtWx2i+/Io2TBgyCRJXvEt1AaSV
 BYNjT4SMlHUfWFAAm3bTQgSinbmC+i3+PETC7dUNKj180bONSizH81Xl1byqOBYI
 dlHdvRl3IdtAfUrHIKZShZj4lW9XhbhmY2zRWKa4KA6P89aYuXOs4NvOvObw3yYr
 x2BSd+zz69RVlG3DKod6LGlp6At73xH1R8HplqIdmjqH03LFx9Av2jkViLhCnmep
 J25ev6BeF7q1wtSX4PJYD6fj8eYCGYK7s5fTmj+p3BGqFNqt20f+/5EgBfXtdBWd
 3MfJETv7g6uf5DaKzRjwKkZMTBTY4F5yLpNetJ/38ymjl6W167H+OlcejSrw8Sb1
 FsHH/m6dgjXctQbJMcJIbNGVCBEhFEj7EJtHs3kene16DssmNprgDJxXeE95K75D
 zbPo4Fu6M2r7cuDhFEMprIbj1411876qK5kvUMLBts7OrPlENqLQL5gOFsAPBJs8
 hPJu+nTtdA8LmhI8uFrWBnyNWdq3vyilJiYchwkvIX7C/Mmn+B6+6sB2L7tlcCTI
 Bkvag46VMFelWMqci0kB
 =HTRw
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2016-04-26 13:11:15 +02:00
parent 58e696d111 350a73b4f8
commit d528c74e69
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/multi_v7_defconfig
View File

@ -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

2
arch/arm/configs/shmobile_defconfig
View File

@ -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

2
arch/arm64/configs/defconfig
View File

@ -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

4
drivers/pci/host/Kconfig
View File

@ -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

2
drivers/pci/host/Makefile
View File

@ -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