Commit 4f9c62d1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-soc-5.13' of... 

Merge tag 'imx-soc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc

i.MX SoC update for 5.13:

- A couple of typo fixes on help text and comment.

* tag 'imx-soc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: Kconfig: Fix typo in help
  ARM: mach-imx: Fix a spelling in the file pm-imx5.c

Link: https://lore.kernel.org/r/20210331041019.31345-2-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3e26eccd f21a4688

arch/arm/mach-imx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ config SOC_IMX35 
	select MXC_AVIC

	select PINCTRL_IMX35

	help

	  This enables support for Freescale i.MX31 processor

	  This enables support for Freescale i.MX35 processor



endif

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
 * This is also the lowest power state possible without affecting

 * non-cpu parts of the system.  For these reasons, imx5 should default

 * to always using this state for cpu idling.  The PM_SUSPEND_STANDBY also

 * uses this state and needs to take no action when registers remain confgiured

 * uses this state and needs to take no action when registers remain configured

 * for this state.

 */

#define IMX5_DEFAULT_CPU_IDLE_STATE WAIT_UNCLOCKED_POWER_OFF