diff options
author | Olof Johansson <olof@lixom.net> | 2017-05-19 00:02:04 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-05-19 00:02:04 -0700 |
commit | 6a3538c1744b1a45e723dc94efa6931e96ce5713 (patch) | |
tree | 509b9ca735e8b248b77dcf3d2fe1a7c9acfc5f09 /arch/arm/boot/dts/imx53-qsrb.dts | |
parent | arm64: defconfig: enable options needed for QCom DB410c board (diff) | |
parent | soc: imx: add PM dependency for IMX7_PM_DOMAINS (diff) | |
download | linux-dev-6a3538c1744b1a45e723dc94efa6931e96ce5713.tar.xz linux-dev-6a3538c1744b1a45e723dc94efa6931e96ce5713.zip |
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 'arch/arm/boot/dts/imx53-qsrb.dts')
-rw-r--r-- | arch/arm/boot/dts/imx53-qsrb.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx53-qsrb.dts b/arch/arm/boot/dts/imx53-qsrb.dts index de2215832372..4e103a905dc9 100644 --- a/arch/arm/boot/dts/imx53-qsrb.dts +++ b/arch/arm/boot/dts/imx53-qsrb.dts @@ -23,7 +23,7 @@ imx53-qsrb { pinctrl_pmic: pmicgrp { fsl,pins = < - MX53_PAD_CSI0_DAT5__GPIO5_23 0x1e4 /* IRQ */ + MX53_PAD_CSI0_DAT5__GPIO5_23 0x1c4 /* IRQ */ >; }; }; |