From ef6221fc58319b9e927e0485b8af056bb79ad7ec Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Nov 2014 21:01:21 +0100 Subject: [PATCH] revert last both reverts, and fix #3628 with enabling CONFIG_REGULATOR_FIXED_VOLTAGE Revert "Revert "projects/*/linux: disable CONFIG_REGULATOR, this fixes #3617"" This reverts commit 35d3633083d4c20898d2082241ed3345c9f58baa. Revert "Revert "projects/imx6/linux: reenable CONFIG_ARM_IMX6_CPUFREQ and CONFIG_REGULATOR_ANATOP support again"" This reverts commit 9243c54226152fa977469adbfbb681797da716d1. projects/imx6/linux: enable CONFIG_REGULATOR_FIXED_VOLTAGE, this fixes #3628 Signed-off-by: Stephan Raue --- projects/imx6/linux/linux.arm.conf | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/projects/imx6/linux/linux.arm.conf b/projects/imx6/linux/linux.arm.conf index b247a6bcd2..32d50795e4 100644 --- a/projects/imx6/linux/linux.arm.conf +++ b/projects/imx6/linux/linux.arm.conf @@ -2046,7 +2046,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_ACT8865 is not set # CONFIG_REGULATOR_AD5398 is not set CONFIG_REGULATOR_ANATOP=y -CONFIG_REGULATOR_DA9052=y +# CONFIG_REGULATOR_DA9052 is not set # CONFIG_REGULATOR_DA9210 is not set # CONFIG_REGULATOR_FAN53555 is not set # CONFIG_REGULATOR_GPIO is not set @@ -2060,10 +2060,9 @@ CONFIG_REGULATOR_DA9052=y # CONFIG_REGULATOR_MAX8660 is not set # CONFIG_REGULATOR_MAX8952 is not set # CONFIG_REGULATOR_MAX8973 is not set -CONFIG_REGULATOR_MC13XXX_CORE=m -CONFIG_REGULATOR_MC13783=m -CONFIG_REGULATOR_MC13892=m -CONFIG_REGULATOR_PFUZE100=y +# CONFIG_REGULATOR_MC13783 is not set +# CONFIG_REGULATOR_MC13892 is not set +# CONFIG_REGULATOR_PFUZE100 is not set # CONFIG_REGULATOR_TPS51632 is not set # CONFIG_REGULATOR_TPS62360 is not set # CONFIG_REGULATOR_TPS65023 is not set @@ -2983,7 +2982,7 @@ CONFIG_LEDS_GPIO=y # CONFIG_LEDS_DA9052 is not set # CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_PWM=y -CONFIG_LEDS_REGULATOR=y +# CONFIG_LEDS_REGULATOR is not set # CONFIG_LEDS_BD2802 is not set # CONFIG_LEDS_LT3593 is not set # CONFIG_LEDS_MC13783 is not set