Commit 125370a9 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'imx-defconfig-4.13' of...

Merge tag 'imx-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig

The i.MX defconfig updates for 4.13:
 - Enable i.MX7 ADC driver support.
 - Enable THERMAL_WRITABLE_TRIPS, so that i.MX thermal driver can set
   trip points for testing.
 - CONFIG_DEBUG_FS gets lost by accident because of a change around
   CONFIG_RCU_TRACE.  Re-enable it explicitly.
 - Enable MXS LRADC driver and CONFIG_CGROUPS for mxs_defconfig.
 - Enable more common cpufreq governors to help test cpufreq driver.

* tag 'imx-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Select CONFIG_IMX7D_ADC
  ARM: imx_v6_v7_defconfig: Set THERMAL_WRITABLE_TRIPS=y for testing
  ARM: imx_v6_v7_defconfig: Explicitly restore CONFIG_DEBUG_FS
  ARM: mxs_defconfig: Re-enable MXS LRADC
  ARM: mxs_defconfig: Enable CONFIG_CGROUPS
  ARM: imx_v6_v7_defconfig: Enable cpufreq governors
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents de9761ad 6db53373
...@@ -55,6 +55,9 @@ CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" ...@@ -55,6 +55,9 @@ CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_ARM_IMX6Q_CPUFREQ=y CONFIG_ARM_IMX6Q_CPUFREQ=y
CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE=y
CONFIG_VFP=y CONFIG_VFP=y
...@@ -204,6 +207,7 @@ CONFIG_POWER_SUPPLY=y ...@@ -204,6 +207,7 @@ CONFIG_POWER_SUPPLY=y
CONFIG_SENSORS_GPIO_FAN=y CONFIG_SENSORS_GPIO_FAN=y
CONFIG_SENSORS_IIO_HWMON=y CONFIG_SENSORS_IIO_HWMON=y
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_WRITABLE_TRIPS=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
CONFIG_IMX_THERMAL=y CONFIG_IMX_THERMAL=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
...@@ -341,6 +345,7 @@ CONFIG_IMX_SDMA=y ...@@ -341,6 +345,7 @@ CONFIG_IMX_SDMA=y
CONFIG_MXS_DMA=y CONFIG_MXS_DMA=y
CONFIG_STAGING=y CONFIG_STAGING=y
CONFIG_IIO=y CONFIG_IIO=y
CONFIG_IMX7D_ADC=y
CONFIG_VF610_ADC=y CONFIG_VF610_ADC=y
CONFIG_MPL3115=y CONFIG_MPL3115=y
CONFIG_PWM=y CONFIG_PWM=y
...@@ -378,6 +383,7 @@ CONFIG_NLS_ISO8859_1=y ...@@ -378,6 +383,7 @@ CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=m CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_UTF8=y CONFIG_NLS_UTF8=y
CONFIG_PRINTK_TIME=y CONFIG_PRINTK_TIME=y
CONFIG_DEBUG_FS=y
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
# CONFIG_SCHED_DEBUG is not set # CONFIG_SCHED_DEBUG is not set
CONFIG_PROVE_LOCKING=y CONFIG_PROVE_LOCKING=y
......
...@@ -8,6 +8,7 @@ CONFIG_TASK_XACCT=y ...@@ -8,6 +8,7 @@ CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y CONFIG_IKCONFIG_PROC=y
CONFIG_CGROUPS=y
# CONFIG_UTS_NS is not set # CONFIG_UTS_NS is not set
# CONFIG_IPC_NS is not set # CONFIG_IPC_NS is not set
# CONFIG_PID_NS is not set # CONFIG_PID_NS is not set
...@@ -75,6 +76,7 @@ CONFIG_INPUT_EVDEV=y ...@@ -75,6 +76,7 @@ CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_MXS_LRADC=y
CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_TSC2007=m
# CONFIG_SERIO is not set # CONFIG_SERIO is not set
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
...@@ -95,6 +97,7 @@ CONFIG_GPIO_SYSFS=y ...@@ -95,6 +97,7 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_STMP3XXX_RTC_WATCHDOG=y CONFIG_STMP3XXX_RTC_WATCHDOG=y
CONFIG_MFD_MXS_LRADC=y
CONFIG_REGULATOR=y CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_FB=y CONFIG_FB=y
...@@ -136,10 +139,9 @@ CONFIG_RTC_DRV_DS1307=m ...@@ -136,10 +139,9 @@ CONFIG_RTC_DRV_DS1307=m
CONFIG_RTC_DRV_STMP=y CONFIG_RTC_DRV_STMP=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
CONFIG_MXS_DMA=y CONFIG_MXS_DMA=y
CONFIG_STAGING=y
CONFIG_MXS_LRADC=y
CONFIG_IIO=y CONFIG_IIO=y
CONFIG_IIO_SYSFS_TRIGGER=y CONFIG_IIO_SYSFS_TRIGGER=y
CONFIG_MXS_LRADC_ADC=y
CONFIG_PWM=y CONFIG_PWM=y
CONFIG_PWM_MXS=y CONFIG_PWM_MXS=y
CONFIG_NVMEM=y CONFIG_NVMEM=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment