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/arm | |
| parent | 41bcfa4cd47bf9ff3049ee4654597ef1f3f1d18c (diff) | |
| parent | 5a87251dac0db8704d4d18b6dc7c23e30804585b (diff) | |
| download | linux-stable-714b348cdc0ec5f8f40410c955b78ab1009250f6.tar.gz linux-stable-714b348cdc0ec5f8f40410c955b78ab1009250f6.tar.bz2 linux-stable-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/arm')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index e9e76e32f10f..bfdd9742d192 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -182,7 +182,7 @@ CONFIG_PCIEPORTBUS=y CONFIG_PCI_MVEBU=y CONFIG_PCI_TEGRA=y CONFIG_PCI_RCAR_GEN2=y -CONFIG_PCIE_RCAR=y +CONFIG_PCIE_RCAR_HOST=y CONFIG_PCI_DRA7XX_EP=y CONFIG_PCI_ENDPOINT=y CONFIG_PCI_ENDPOINT_CONFIGFS=y diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index bbedc42bb2d9..4a161b3c35b9 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -37,7 +37,7 @@ CONFIG_CAN_RCAR=y CONFIG_PCI=y CONFIG_PCI_MSI=y CONFIG_PCI_RCAR_GEN2=y -CONFIG_PCIE_RCAR=y +CONFIG_PCIE_RCAR_HOST=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_SIMPLE_PM_BUS=y @@ -64,6 +64,7 @@ CONFIG_KEYBOARD_GPIO=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_EDT_FT5X06=y CONFIG_TOUCHSCREEN_ST1232=y +CONFIG_TOUCHSCREEN_STMPE=y CONFIG_INPUT_MISC=y CONFIG_INPUT_DA9063_ONKEY=y CONFIG_INPUT_ADXL34X=y @@ -104,6 +105,7 @@ CONFIG_RENESAS_WDT=y CONFIG_RENESAS_RZAWDT=y CONFIG_MFD_AS3711=y CONFIG_MFD_DA9063=y +CONFIG_MFD_STMPE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_AS3711=y CONFIG_REGULATOR_DA9210=y @@ -134,7 +136,6 @@ CONFIG_DRM_SIMPLE_BRIDGE=y CONFIG_DRM_I2C_ADV7511=y CONFIG_DRM_I2C_ADV7511_AUDIO=y CONFIG_FB_SH_MOBILE_LCDC=y -# CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_PWM=y CONFIG_BACKLIGHT_AS3711=y CONFIG_SOUND=y |