diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 15:04:30 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 15:04:30 -0400 |
| commit | 6df5132aeeae041038ed2396697df5ff558a4291 (patch) | |
| tree | 6c60bc363c21262672602a5e3538659f8dbd535f | |
| parent | 117a6df3ef067e69f1de5db304a1e07e23f8f484 (diff) | |
| parent | 72585c8b99c52bb05df63e44f9d22ca89435baad (diff) | |
Merge tag 'armsoc/for-3.15/soc-4' of git://github.com/broadcom/mach-bcm into next/soc
Merge "ARM: mach-bcm: soc updates for 3.15 - part 3" from Matt Porter
- enable bcm590xx regulator driver in bcm_defconfig
* tag 'armsoc/for-3.15/soc-4' of git://github.com/broadcom/mach-bcm:
ARM: configs: bcm_defconfig: enable bcm590xx regulator support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/configs/bcm_defconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig index 2519d6de0640..01004640ee4d 100644 --- a/arch/arm/configs/bcm_defconfig +++ b/arch/arm/configs/bcm_defconfig | |||
| @@ -79,6 +79,13 @@ CONFIG_HW_RANDOM=y | |||
| 79 | CONFIG_I2C=y | 79 | CONFIG_I2C=y |
| 80 | CONFIG_I2C_CHARDEV=y | 80 | CONFIG_I2C_CHARDEV=y |
| 81 | # CONFIG_HWMON is not set | 81 | # CONFIG_HWMON is not set |
| 82 | CONFIG_MFD_BCM590XX=y | ||
| 83 | CONFIG_REGULATOR=y | ||
| 84 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | ||
| 85 | CONFIG_REGULATOR_VIRTUAL_CONSUMER=y | ||
| 86 | CONFIG_REGULATOR_USERSPACE_CONSUMER=y | ||
| 87 | CONFIG_REGULATOR_BCM590XX=y | ||
| 88 | |||
| 82 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 89 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| 83 | CONFIG_FB=y | 90 | CONFIG_FB=y |
| 84 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 91 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |