Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c463d09 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap2/3/4: Update PMIC options for TWL and Menelaus chips 



These are needed for mounting root on MMC on many boards.
Also disable CONFIG_WATCHDOG_NOWAYOUT, that can keep the
system from running with external watchdogs.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 75eaf1ea

arch/arm/configs/omap3_defconfig

+7 −6
Original line number Diff line number Diff line
@@ -1263,7 +1263,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_LIS3_I2C is not set

# CONFIG_THERMAL is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

# CONFIG_WATCHDOG_NOWAYOUT is not set



#

# Watchdog Device Drivers
@@ -1292,9 +1292,9 @@ CONFIG_MFD_CORE=y 
# CONFIG_HTC_EGPIO is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_TPS65010 is not set

# CONFIG_MENELAUS is not set

CONFIG_MENELAUS=y

CONFIG_TWL4030_CORE=y

# CONFIG_TWL4030_POWER is not set

CONFIG_TWL4030_POWER=y

CONFIG_TWL4030_CODEC=y

# CONFIG_MFD_TMIO is not set

# CONFIG_MFD_T7L66XB is not set
@@ -1313,7 +1313,7 @@ CONFIG_TWL4030_CODEC=y 
# CONFIG_AB4500_CORE is not set

CONFIG_REGULATOR=y

# CONFIG_REGULATOR_DEBUG is not set

CONFIG_REGULATOR_FIXED_VOLTAGE=y

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set

# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set

# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set

# CONFIG_REGULATOR_BQ24022 is not set
@@ -1321,8 +1321,8 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y 
# CONFIG_REGULATOR_MAX8660 is not set

CONFIG_REGULATOR_TWL4030=y

# CONFIG_REGULATOR_LP3971 is not set

# CONFIG_REGULATOR_TPS65023 is not set

# CONFIG_REGULATOR_TPS6507X is not set

CONFIG_REGULATOR_TPS65023=y

CONFIG_REGULATOR_TPS6507X=y

# CONFIG_MEDIA_SUPPORT is not set



#
@@ -1752,6 +1752,7 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_PCF8583 is not set

# CONFIG_RTC_DRV_M41T80 is not set

# CONFIG_RTC_DRV_BQ32K is not set

CONFIG_RTC_DRV_TWL92330=y

CONFIG_RTC_DRV_TWL4030=y

# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set