Commit 1ce3b12f authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'imx-fixes-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

The i.MX fixes for 4.8:
 - Fix typo in imx6sx-sabreauto board wakeup property
 - Fix i.MX6UL suspend-to-standby support by adding the
   BM_CLPCR_BYP_MMDC_CH0_LPM_HS handling
 - Fix a i.MX6UL regression on suspend support, which is caused by
   commit 850bea23 ("arm: Remove unnecessary of_platform_populate
   with default match table")

* tag 'imx-fixes-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: imx6ul: populates platform device at .init_machine
  ARM: imx6: add missing BM_CLPCR_BYP_MMDC_CH0_LPM_HS setting for imx6ul
  ARM: dts: imx6sx-sabreauto: Fix misspelled property

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents becc8d3c cfee6b58

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ 
	cd-gpios = <&gpio7 11 GPIO_ACTIVE_LOW>;

	cd-gpios = <&gpio7 11 GPIO_ACTIVE_LOW>;

	no-1-8-v;

	no-1-8-v;

	keep-power-in-suspend;

	keep-power-in-suspend;

	enable-sdio-wakup;

	wakeup-source;

	status = "okay";

	status = "okay";

};

};

arch/arm/mach-imx/mach-imx6ul.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,7 @@ static void __init imx6ul_init_machine(void) 
	if (parent == NULL)

	if (parent == NULL)

		pr_warn("failed to initialize soc device\n");

		pr_warn("failed to initialize soc device\n");





	of_platform_default_populate(NULL, NULL, parent);

	imx6ul_enet_init();

	imx6ul_enet_init();

	imx_anatop_init();

	imx_anatop_init();

	imx6ul_pm_init();

	imx6ul_pm_init();

arch/arm/mach-imx/pm-imx6.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -295,7 +295,7 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode) 
		val &= ~BM_CLPCR_SBYOS;

		val &= ~BM_CLPCR_SBYOS;

		if (cpu_is_imx6sl())

		if (cpu_is_imx6sl())

			val |= BM_CLPCR_BYPASS_PMIC_READY;

			val |= BM_CLPCR_BYPASS_PMIC_READY;

		if (cpu_is_imx6sl() || cpu_is_imx6sx())

		if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6ul())

			val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS;

			val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS;

		else

		else

			val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS;

			val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS;

CRA Git | Maintained and supported by SUSTech CRA and CCSE