summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-05-19 00:02:04 -0700
committerOlof Johansson <olof@lixom.net>2017-05-19 00:02:04 -0700
commit6a3538c1744b1a45e723dc94efa6931e96ce5713 (patch)
tree509b9ca735e8b248b77dcf3d2fe1a7c9acfc5f09 /drivers/soc
parentf4e506c5a3a026a28c99ca2cbc1c79aeca1a1b68 (diff)
parente23c7f7d57831fdae444be9d507e67716ab601d4 (diff)
downloadop-kernel-dev-6a3538c1744b1a45e723dc94efa6931e96ce5713.zip
op-kernel-dev-6a3538c1744b1a45e723dc94efa6931e96ce5713.tar.gz
Merge tag 'imx-fixes-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
i.MX fixes for 4.12: - A fix on GPCv2 power domain driver Kconfig which causes a build failure when CONFIG_PM is not set. - Pull down PMIC IRQ pin for imx53-qsrb board to prevent spurious PMIC interrupts from happening. - Remove board level OPP override for imx6sx-sdb to fix a boot crash seen on Rev.C boards. * tag 'imx-fixes-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: soc: imx: add PM dependency for IMX7_PM_DOMAINS ARM: dts: imx6sx-sdb: Remove OPP override ARM: dts: imx53-qsrb: Pulldown PMIC IRQ pin Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/imx/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig
index 357a5d8..a5b86a2 100644
--- a/drivers/soc/imx/Kconfig
+++ b/drivers/soc/imx/Kconfig
@@ -2,8 +2,9 @@ menu "i.MX SoC drivers"
config IMX7_PM_DOMAINS
bool "i.MX7 PM domains"
- select PM_GENERIC_DOMAINS
depends on SOC_IMX7D || (COMPILE_TEST && OF)
+ depends on PM
+ select PM_GENERIC_DOMAINS
default y if SOC_IMX7D
endmenu
OpenPOWER on IntegriCloud