diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 14:06:14 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 14:06:14 +0200 |
| commit | 1ed59b8f4390df4d4ee77b85f1681a3056c10a24 (patch) | |
| tree | 9f2126dea1ed0cfcf928585944c869cadee8d843 /arch | |
| parent | 51a8506608054610e6d3ff739c5ff4adccc36276 (diff) | |
| parent | 526b87fdba9160263c30ad6dfd79034ec0b21631 (diff) | |
Merge tag 'at91-ab-4.8-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig
Merge "Defconfig changes for 4.8 #2:" from Alexandre Belloni:
- Addition of the sama5d2 xplained PMIC: ACT8945A
* tag 'at91-ab-4.8-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: multi_v7_defconfig: add ACT8945A
ARM: at91/defconfig: Add ACT8945A driver
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/sama5_defconfig | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index f6e7068525f5..29e84c3f6e67 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -415,6 +415,7 @@ CONFIG_GPIO_PALMAS=y CONFIG_GPIO_SYSCON=y CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y +CONFIG_BATTERY_ACT8945A=y CONFIG_BATTERY_SBS=y CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m @@ -463,6 +464,7 @@ CONFIG_DIGICOLOR_WATCHDOG=y CONFIG_BCM2835_WDT=y CONFIG_BCM7038_WDT=m CONFIG_BCM_KONA_WDT=y +CONFIG_MFD_ACT8945A=y CONFIG_MFD_AS3711=y CONFIG_MFD_AS3722=y CONFIG_MFD_ATMEL_FLEXCOM=y @@ -493,6 +495,7 @@ CONFIG_MFD_TPS65217=y CONFIG_MFD_TPS65218=y CONFIG_MFD_TPS6586X=y CONFIG_MFD_TPS65910=y +CONFIG_REGULATOR_ACT8945A=y CONFIG_REGULATOR_AB8500=y CONFIG_REGULATOR_ACT8865=y CONFIG_REGULATOR_AS3711=y diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index 9cb1a85bb166..aca8625b6fc9 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -129,16 +129,19 @@ CONFIG_SPI_ATMEL=y CONFIG_SPI_GPIO=y CONFIG_GPIO_SYSFS=y CONFIG_POWER_SUPPLY=y +CONFIG_BATTERY_ACT8945A=y CONFIG_POWER_RESET=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_AT91SAM9X_WATCHDOG=y CONFIG_SAMA5D4_WATCHDOG=y +CONFIG_MFD_ACT8945A=y CONFIG_MFD_ATMEL_FLEXCOM=y CONFIG_MFD_ATMEL_HLCDC=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_ACT8865=y +CONFIG_REGULATOR_ACT8945A=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y |