Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a3538c1 authored May 19, 2017 by Olof Johansson

Merge tag 'imx-fixes-4.12' of...

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>

parents f4e506c5 e23c7f7d

arch/arm/boot/dts/imx53-qsrb.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */
		>;
		};
		};

arch/arm/boot/dts/imx6sx-sdb.dts

+0 −17

Original line number	Diff line number	Diff line
		@@ -12,23 +12,6 @@
		model = "Freescale i.MX6 SoloX SDB RevB Board";
		};

		&cpu0 {
		operating-points = <
		/* kHz uV */
		996000 1250000
		792000 1175000
		396000 1175000
		198000 1175000
		>;
		fsl,soc-operating-points = <
		/* ARM kHz SOC uV */
		996000 1250000
		792000 1175000
		396000 1175000
		198000 1175000
		>;
		};

		&i2c1 {
		clock-frequency = <100000>;
		pinctrl-names = "default";

drivers/soc/imx/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -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