From: Frank Li <Frank.Li@freescale.com>
Date: Tue, 5 Jan 2016 17:17:16 +0000 (-0600)
Subject: ARM: imx_v6_v7_defconfig: enable psci default
X-Git-Tag: v4.6-rc1~72^2~2^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=da536e276ded60084a24af47b97ed76741be7605;p=users%2Fjedix%2Flinux-maple.git

ARM: imx_v6_v7_defconfig: enable psci default

i.MX7D uboot support psci firmware.
Enabled psci default.

Signed-off-by: Frank Li <Frank.Li@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 2d5253dcc226..1e792efe139b 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -47,6 +47,7 @@ CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_IMX6=y
 CONFIG_SMP=y
+CONFIG_ARM_PSCI=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y