Commit c9147676 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-5.2-2' of... 

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

i.MX fixes for 5.2, round 2:
 - A fix on LS1028A device tree CPU state to get CPU idle work.
 - Enable FSL_EDMA driver support in defconfig to fix a indefinite
   deferring probe on Layerscape platforms.

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

:
  arm64: defconfig: Enable FSL_EDMA driver
  arm64: dts: ls1028a: Fix CPU idle fail.

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

arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
			enable-method = "psci";

			clocks = <&clockgen 1 0>;

			next-level-cache = <&l2>;

			cpu-idle-states = <&CPU_PH20>;

			cpu-idle-states = <&CPU_PW20>;

		};



		cpu1: cpu@1 {
@@ -38,7 +38,7 @@ 
			enable-method = "psci";

			clocks = <&clockgen 1 0>;

			next-level-cache = <&l2>;

			cpu-idle-states = <&CPU_PH20>;

			cpu-idle-states = <&CPU_PW20>;

		};



		l2: l2-cache {
@@ -53,13 +53,13 @@ 
		 */

		entry-method = "arm,psci";



		CPU_PH20: cpu-ph20 {

		CPU_PW20: cpu-pw20 {

			  compatible = "arm,idle-state";

			idle-state-name = "PH20";

			arm,psci-suspend-param = <0x00010000>;

			entry-latency-us = <1000>;

			exit-latency-us = <1000>;

			min-residency-us = <3000>;

			  idle-state-name = "PW20";

			  arm,psci-suspend-param = <0x0>;

			  entry-latency-us = <2000>;

			  exit-latency-us = <2000>;

			  min-residency-us = <6000>;

		};

	};

arch/arm64/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -613,6 +613,7 @@ CONFIG_RTC_DRV_TEGRA=y 
CONFIG_RTC_DRV_IMX_SC=m

CONFIG_RTC_DRV_XGENE=y

CONFIG_DMADEVICES=y

CONFIG_FSL_EDMA=y

CONFIG_DMA_BCM2835=m

CONFIG_K3_DMA=y

CONFIG_MV_XOR=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE