diff options
| author | Olof Johansson <olof@lixom.net> | 2018-05-25 13:51:58 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-25 13:51:58 +0200 |
| commit | 3b4fa7f9093988b136e4c8a4e72f81ea60b34420 (patch) | |
| tree | 64e0c84ea62e53258d330bb57e9fe3677829fb5a | |
| parent | Merge tag 'v4.18-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | ARM: multi_v7_defconfig: enable the Meson PWM controller (diff) | |
| download | linux-3b4fa7f9093988b136e4c8a4e72f81ea60b34420.tar.xz linux-3b4fa7f9093988b136e4c8a4e72f81ea60b34420.zip | |
Merge tag 'amlogic-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/defconfig
Amlogic: defconfig updates for v4.18
- multi_v7_defconfig: enable meson PWM, I2C drivers
* tag 'amlogic-defconfig' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
ARM: multi_v7_defconfig: enable the Meson PWM controller
arm: multi_v7_defconfig: enable the Amlogic Meson I2C driver
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index c2093166cf40..0c7abc87f01a 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -368,6 +368,7 @@ CONFIG_HVC_DRIVER=y CONFIG_VIRTIO_CONSOLE=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_DAVINCI=y +CONFIG_I2C_MESON=y CONFIG_I2C_MUX=y CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_MUX_PCA954x=y @@ -953,6 +954,7 @@ CONFIG_PWM_ATMEL=m CONFIG_PWM_ATMEL_HLCDC_PWM=m CONFIG_PWM_ATMEL_TCB=m CONFIG_PWM_FSL_FTM=m +CONFIG_PWM_MESON=m CONFIG_PWM_RCAR=m CONFIG_PWM_RENESAS_TPU=y CONFIG_PWM_ROCKCHIP=m |