summaryrefslogtreecommitdiffstats
path: root/arch/arm64/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2021-06-16 17:32:27 -0700
committerOlof Johansson <olof@lixom.net>2021-06-16 17:32:28 -0700
commitc8700d80d75e8b5d31ea91e1a825b3cf87f823f4 (patch)
tree5f97056739817302a63b7f24a5b5ecdf25f61d36 /arch/arm64/configs
parent020b31abb7ad6cd5f5ed808bb9b82e1d6a9fcfe8 (diff)
parentd1588b22dcbb662d94740489713b8fcfe3c13023 (diff)
downloadlinux-c8700d80d75e8b5d31ea91e1a825b3cf87f823f4.tar.bz2
Merge tag 'visconti-arm-defconfig-for-v5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti into arm/defconfig
Visconti defconfig updates for v5.14 - Enable Visconti's PWM in the ARM64 defconfig as a module. - Enable Visconti's GPIO in the ARM64 defconfig. * tag 'visconti-arm-defconfig-for-v5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti: arm64: defconfig: Visconti: Enable GPIO arm64: defconfig: Visconti: Enable PWM Link: https://lore.kernel.org/r/20210615231232.pllzlqoamkmnsqq6@toshiba.co.jp Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/configs')
-rw-r--r--arch/arm64/configs/defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 662b00355ea2..88fc0d564c89 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -530,6 +530,7 @@ CONFIG_GPIO_MXC=y
CONFIG_GPIO_PL061=y
CONFIG_GPIO_RCAR=y
CONFIG_GPIO_UNIPHIER=y
+CONFIG_GPIO_VISCONTI=y
CONFIG_GPIO_WCD934X=m
CONFIG_GPIO_XGENE=y
CONFIG_GPIO_XGENE_SB=y
@@ -1092,6 +1093,7 @@ CONFIG_PWM_SAMSUNG=y
CONFIG_PWM_SL28CPLD=m
CONFIG_PWM_SUN4I=m
CONFIG_PWM_TEGRA=m
+CONFIG_PWM_VISCONTI=m
CONFIG_SL28CPLD_INTC=y
CONFIG_QCOM_PDC=y
CONFIG_RESET_IMX7=y