diff options
author | Olof Johansson <olof@lixom.net> | 2020-09-13 11:20:58 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2020-09-13 11:20:59 -0700 |
commit | 714b348cdc0ec5f8f40410c955b78ab1009250f6 (patch) | |
tree | 1c8345cce34974e5eb3d4b0282e93aa1a6c46e78 /arch/arm64 | |
parent | 41bcfa4cd47bf9ff3049ee4654597ef1f3f1d18c (diff) | |
parent | 5a87251dac0db8704d4d18b6dc7c23e30804585b (diff) | |
download | linux-714b348cdc0ec5f8f40410c955b78ab1009250f6.tar.gz linux-714b348cdc0ec5f8f40410c955b78ab1009250f6.tar.bz2 linux-714b348cdc0ec5f8f40410c955b78ab1009250f6.zip |
Merge tag 'renesas-arm-defconfig-for-v5.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/defconfig
Renesas ARM defconfig updates for v5.10
- Enable touchscreen support on the iWave RZ/G1E platform,
- Update for PCIE_RCAR => CONFIG_PCIE_RCAR_{HOST,EP} split, including
enabling the latter,
- Enable FLASH support on various R-Car Gen3 boards,
- Refresh shmobile_defconfig for v5.9-rc1.
* tag 'renesas-arm-defconfig-for-v5.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
ARM: shmobile: defconfig: Enable CONFIG_PCIE_RCAR_HOST
ARM: multi_v7_defconfig: Enable CONFIG_PCIE_RCAR_HOST
arm64: defconfig: Enable RPC-IF support
ARM: shmobile: defconfig: Refresh for v5.9-rc1
arm64: defconfig: Enable R-Car PCIe endpoint driver
ARM: shmobile: defconfig: Enable TOUCHSCREEN_STMPE
Link: https://lore.kernel.org/r/20200904114819.30254-2-geert+renesas@glider.be
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/configs/defconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index e0f33826819f..f1da99974efc 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -208,6 +208,7 @@ CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_PCI_AARDVARK=y CONFIG_PCI_TEGRA=y CONFIG_PCIE_RCAR_HOST=y +CONFIG_PCIE_RCAR_EP=y CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_XGENE=y CONFIG_PCIE_ALTERA=y @@ -224,6 +225,9 @@ CONFIG_PCIE_ARMADA_8K=y CONFIG_PCIE_KIRIN=y CONFIG_PCIE_HISI_STB=y CONFIG_PCIE_TEGRA194_HOST=m +CONFIG_PCI_ENDPOINT=y +CONFIG_PCI_ENDPOINT_CONFIGFS=y +CONFIG_PCI_EPF_TEST=m CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_FW_LOADER_USER_HELPER=y @@ -254,6 +258,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_VIRTIO_BLK=y CONFIG_BLK_DEV_NVME=m CONFIG_SRAM=y +CONFIG_PCI_ENDPOINT_TEST=m CONFIG_EEPROM_AT24=m CONFIG_EEPROM_AT25=m CONFIG_UACCE=m @@ -453,6 +458,7 @@ CONFIG_SPI_MESON_SPIFC=m CONFIG_SPI_ORION=y CONFIG_SPI_PL022=y CONFIG_SPI_ROCKCHIP=y +CONFIG_SPI_RPCIF=m CONFIG_SPI_QCOM_QSPI=m CONFIG_SPI_QUP=y CONFIG_SPI_QCOM_GENI=m @@ -916,6 +922,7 @@ CONFIG_ARCH_K3_J721E_SOC=y CONFIG_TI_SCI_PM_DOMAINS=y CONFIG_EXTCON_USB_GPIO=y CONFIG_EXTCON_USBC_CROS_EC=y +CONFIG_RENESAS_RPCIF=m CONFIG_IIO=y CONFIG_EXYNOS_ADC=y CONFIG_MAX9611=m |