Skip to content

Commit 714b348

Browse files
committed
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>
2 parents 41bcfa4 + 5a87251 commit 714b348

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

arch/arm/configs/multi_v7_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ CONFIG_PCIEPORTBUS=y
182182
CONFIG_PCI_MVEBU=y
183183
CONFIG_PCI_TEGRA=y
184184
CONFIG_PCI_RCAR_GEN2=y
185-
CONFIG_PCIE_RCAR=y
185+
CONFIG_PCIE_RCAR_HOST=y
186186
CONFIG_PCI_DRA7XX_EP=y
187187
CONFIG_PCI_ENDPOINT=y
188188
CONFIG_PCI_ENDPOINT_CONFIGFS=y

arch/arm/configs/shmobile_defconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ CONFIG_CAN_RCAR=y
3737
CONFIG_PCI=y
3838
CONFIG_PCI_MSI=y
3939
CONFIG_PCI_RCAR_GEN2=y
40-
CONFIG_PCIE_RCAR=y
40+
CONFIG_PCIE_RCAR_HOST=y
4141
CONFIG_DEVTMPFS=y
4242
CONFIG_DEVTMPFS_MOUNT=y
4343
CONFIG_SIMPLE_PM_BUS=y
@@ -64,6 +64,7 @@ CONFIG_KEYBOARD_GPIO=y
6464
CONFIG_INPUT_TOUCHSCREEN=y
6565
CONFIG_TOUCHSCREEN_EDT_FT5X06=y
6666
CONFIG_TOUCHSCREEN_ST1232=y
67+
CONFIG_TOUCHSCREEN_STMPE=y
6768
CONFIG_INPUT_MISC=y
6869
CONFIG_INPUT_DA9063_ONKEY=y
6970
CONFIG_INPUT_ADXL34X=y
@@ -104,6 +105,7 @@ CONFIG_RENESAS_WDT=y
104105
CONFIG_RENESAS_RZAWDT=y
105106
CONFIG_MFD_AS3711=y
106107
CONFIG_MFD_DA9063=y
108+
CONFIG_MFD_STMPE=y
107109
CONFIG_REGULATOR_FIXED_VOLTAGE=y
108110
CONFIG_REGULATOR_AS3711=y
109111
CONFIG_REGULATOR_DA9210=y
@@ -134,7 +136,6 @@ CONFIG_DRM_SIMPLE_BRIDGE=y
134136
CONFIG_DRM_I2C_ADV7511=y
135137
CONFIG_DRM_I2C_ADV7511_AUDIO=y
136138
CONFIG_FB_SH_MOBILE_LCDC=y
137-
# CONFIG_BACKLIGHT_GENERIC is not set
138139
CONFIG_BACKLIGHT_PWM=y
139140
CONFIG_BACKLIGHT_AS3711=y
140141
CONFIG_SOUND=y

arch/arm64/configs/defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ CONFIG_HOTPLUG_PCI_ACPI=y
208208
CONFIG_PCI_AARDVARK=y
209209
CONFIG_PCI_TEGRA=y
210210
CONFIG_PCIE_RCAR_HOST=y
211+
CONFIG_PCIE_RCAR_EP=y
211212
CONFIG_PCI_HOST_GENERIC=y
212213
CONFIG_PCI_XGENE=y
213214
CONFIG_PCIE_ALTERA=y
@@ -224,6 +225,9 @@ CONFIG_PCIE_ARMADA_8K=y
224225
CONFIG_PCIE_KIRIN=y
225226
CONFIG_PCIE_HISI_STB=y
226227
CONFIG_PCIE_TEGRA194_HOST=m
228+
CONFIG_PCI_ENDPOINT=y
229+
CONFIG_PCI_ENDPOINT_CONFIGFS=y
230+
CONFIG_PCI_EPF_TEST=m
227231
CONFIG_DEVTMPFS=y
228232
CONFIG_DEVTMPFS_MOUNT=y
229233
CONFIG_FW_LOADER_USER_HELPER=y
@@ -254,6 +258,7 @@ CONFIG_BLK_DEV_NBD=m
254258
CONFIG_VIRTIO_BLK=y
255259
CONFIG_BLK_DEV_NVME=m
256260
CONFIG_SRAM=y
261+
CONFIG_PCI_ENDPOINT_TEST=m
257262
CONFIG_EEPROM_AT24=m
258263
CONFIG_EEPROM_AT25=m
259264
CONFIG_UACCE=m
@@ -453,6 +458,7 @@ CONFIG_SPI_MESON_SPIFC=m
453458
CONFIG_SPI_ORION=y
454459
CONFIG_SPI_PL022=y
455460
CONFIG_SPI_ROCKCHIP=y
461+
CONFIG_SPI_RPCIF=m
456462
CONFIG_SPI_QCOM_QSPI=m
457463
CONFIG_SPI_QUP=y
458464
CONFIG_SPI_QCOM_GENI=m
@@ -916,6 +922,7 @@ CONFIG_ARCH_K3_J721E_SOC=y
916922
CONFIG_TI_SCI_PM_DOMAINS=y
917923
CONFIG_EXTCON_USB_GPIO=y
918924
CONFIG_EXTCON_USBC_CROS_EC=y
925+
CONFIG_RENESAS_RPCIF=m
919926
CONFIG_IIO=y
920927
CONFIG_EXYNOS_ADC=y
921928
CONFIG_MAX9611=m

0 commit comments

Comments
 (0)