diff options
author | Robin Gong <yibin.gong@nxp.com> | 2016-01-12 15:16:45 +0800 |
---|---|---|
committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
commit | 17aae1b77a110da54a4115b41c50e4fd7ddc2a75 (patch) | |
tree | 546ccaf89b6a8d3c3ccb4dae36c630f8ed8f141c /arch/arm/configs | |
parent | 2104ad0a23e9db5d75868336fd07c52f1af4deda (diff) |
MLK-12211-2: ARM: configs: imx_v7_defconfig: enable CONFIG_POWER_RESET_SYSCON_POWEROFF
On v4.1, use syscon-poweroff driver instead of poweroff interface in
rtc-snvs driver.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index c5be7df2676a..789ac87f69a7 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -194,6 +194,8 @@ CONFIG_GPIO_PCA953X=y CONFIG_GPIO_74X164=y CONFIG_POWER_SUPPLY=y CONFIG_SABRESD_MAX8903=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_SENSORS_MAX17135=y CONFIG_SENSORS_MAG3110=y CONFIG_THERMAL=y @@ -355,8 +357,8 @@ CONFIG_STAGING=y CONFIG_STAGING_MEDIA=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y -CONFIG_VF610_ADC=y CONFIG_IMX7D_ADC=y +CONFIG_VF610_ADC=y CONFIG_PWM=y CONFIG_PWM_IMX=y CONFIG_EXT2_FS=y |