diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2015-11-06 13:12:27 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2015-11-06 13:12:27 +0000 |
| commit | fba6df276661ef1b5ffe47c8af00c31d7c626ae9 (patch) | |
| tree | c7d8ef468136d62b4d91e29bb35cc14143099def | |
| parent | 9212040aa0c8ad900ede87e05c9d64591e03cd1a (diff) | |
| download | kernel-fba6df276661ef1b5ffe47c8af00c31d7c626ae9.tar.gz kernel-fba6df276661ef1b5ffe47c8af00c31d7c626ae9.tar.xz kernel-fba6df276661ef1b5ffe47c8af00c31d7c626ae9.zip | |
ARMv7: minor charging/battery/regulator update
| -rw-r--r-- | config-armv7 | 15 | ||||
| -rw-r--r-- | config-armv7-generic | 4 | ||||
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 4 |
4 files changed, 13 insertions, 11 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 diff --git a/config-armv7-generic b/config-armv7-generic index db080c2e0..abb8ed76c 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -542,7 +542,6 @@ CONFIG_USB_CONFIGFS_SERIAL=y # Multifunction Devices CONFIG_MFD_TPS65090=y -CONFIG_MFD_TPS65217=y CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912=y CONFIG_MFD_TPS65912_I2C=y @@ -669,9 +668,6 @@ CONFIG_SND_ARM=y CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_AC97_CODEC=y -# Displays -CONFIG_BACKLIGHT_TPS65217=m - # RTC CONFIG_RTC_DRV_DS1305=m CONFIG_RTC_DRV_DS1390=m diff --git a/config-generic b/config-generic index 99acdb947..3e4f4b285 100644 --- a/config-generic +++ b/config-generic @@ -5300,6 +5300,7 @@ CONFIG_APM_POWER=m # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_BQ27XXX is not set # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set diff --git a/kernel.spec b/kernel.spec index dfc0eb6c7..aadde667d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2036,9 +2036,9 @@ fi # # %changelog -* Thu Nov 5 2015 Peter Robinson <pbrobinson@fedoraproject.org> +* Fri Nov 6 2015 Peter Robinson <pbrobinson@fedoraproject.org> - Disable Exynos IOMMU as it crashes -- Minor ARMv7 update +- Minor ARMv7 update for battiery/charging * Thu Nov 05 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git3.1 - Linux v4.3-6681-g8e483ed |