summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-11-06 13:12:27 +0000
committerPeter Robinson <pbrobinson@gmail.com>2015-11-06 13:12:27 +0000
commitfba6df276661ef1b5ffe47c8af00c31d7c626ae9 (patch)
treec7d8ef468136d62b4d91e29bb35cc14143099def /config-armv7
parent9212040aa0c8ad900ede87e05c9d64591e03cd1a (diff)
downloadkernel-fba6df276661ef1b5ffe47c8af00c31d7c626ae9.tar.gz
kernel-fba6df276661ef1b5ffe47c8af00c31d7c626ae9.tar.xz
kernel-fba6df276661ef1b5ffe47c8af00c31d7c626ae9.zip
ARMv7: minor charging/battery/regulator update
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv715
1 files changed, 10 insertions, 5 deletions
diff --git a/config-armv7 b/config-armv7
index 727b3fbca..36ea19868 100644
--- a/config-armv7
+++ b/config-armv7
@@ -62,9 +62,9 @@ CONFIG_TWL4030_MADC=m
CONFIG_TWL4030_POWER=y
CONFIG_TWL4030_WATCHDOG=m
CONFIG_BATTERY_TWL4030_MADC=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_BQ27X00_I2C=y
-CONFIG_BATTERY_BQ27X00_PLATFORM=y
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=y
+CONFIG_BATTERY_BQ27XXX_PLATFORM=y
CONFIG_OMAP_USB2=m
CONFIG_OMAP_CONTROL_PHY=m
CONFIG_TI_PIPE3=m
@@ -238,8 +238,6 @@ CONFIG_TI_CPSW=m
CONFIG_TI_CPSW_PHY_SEL=y
CONFIG_TI_CPSW_ALE=m
CONFIG_TI_CPTS=y
-# Builtin needed for BBone White
-CONFIG_REGULATOR_TPS65217=y
CONFIG_TI_EMIF=m
CONFIG_DRM_TILCDC=m
# We only need this until the BBB dts is actually updated
@@ -263,6 +261,13 @@ CONFIG_VIDEO_AM437X_VPFE=m
CONFIG_UIO_PRUSS=m
CONFIG_WKUP_M3_RPROC=m
+# Builtin needed for BBone White
+CONFIG_MFD_TPS65217=y
+CONFIG_REGULATOR_TPS65217=y
+CONFOG_CHARGER_TPS65217=m
+CONFIG_BACKLIGHT_TPS65217=m
+CONFIG_REGULATOR_TPS65217=m
+
CONFIG_CAN_C_CAN=m
CONFIG_CAN_C_CAN_PLATFORM=m