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

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

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

i.MX SoC changes for 4.21:
 - An improvement on i.MX debugging options that only defines
   DEBUG_IMX_UART_PORT if needed, so that the option will not be present
   in the kernel config when DEBUG_LL is disabled.
 - Adds the necessary platform support for i.MX7ULP SoC and configures
   power mode to Partial Stop mode 3 with system/bus clock enabled.
   Otherwise the default STOP mode will gate off system/bus clock when
   WFI gets executed on i.MX7ULP.
 - A fix from Arnd on SOC_IMX7ULP option dependency.

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

:
  ARM: imx: fix dependencies on imx7ulp
  ARM: imx: add initial support for imx7ulp
  ARM: debug-imx: only define DEBUG_IMX_UART_PORT if needed

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3aab5403 167e6370

arch/arm/Kconfig.debug

+14 −14
Original line number Diff line number Diff line
@@ -1469,7 +1469,8 @@ config DEBUG_OMAP2PLUS_UART 
	depends on ARCH_OMAP2PLUS



config DEBUG_IMX_UART_PORT

	int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \

	int "i.MX Debug UART Port Selection"

	depends on DEBUG_IMX1_UART || \

		   DEBUG_IMX25_UART || \

		   DEBUG_IMX21_IMX27_UART || \

		   DEBUG_IMX31_UART || \
@@ -1483,7 +1484,6 @@ config DEBUG_IMX_UART_PORT 
		   DEBUG_IMX6UL_UART || \

		   DEBUG_IMX7D_UART

	default 1

	depends on ARCH_MXC

	help

	  Choose UART port on which kernel low-level debug messages

	  should be output.

arch/arm/mach-imx/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -558,6 +558,15 @@ config SOC_IMX7D 
	help

		This enables support for Freescale i.MX7 Dual processor.



config SOC_IMX7ULP

	bool "i.MX7ULP support"

	select CLKSRC_IMX_TPM

	select PINCTRL_IMX7ULP

	select SOC_IMX7D_CA7 if ARCH_MULTI_V7

	select SOC_IMX7D_CM4 if ARM_SINGLE_ARMV7M

	help

	  This enables support for Freescale i.MX7 Ultra Low Power processor.



config SOC_VF610

	bool "Vybrid Family VF610 support"

	select ARM_GIC if ARCH_MULTI_V7

arch/arm/mach-imx/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ obj-$(CONFIG_SOC_IMX6SX) += mach-imx6sx.o 
obj-$(CONFIG_SOC_IMX6UL) += mach-imx6ul.o

obj-$(CONFIG_SOC_IMX7D_CA7) += mach-imx7d.o

obj-$(CONFIG_SOC_IMX7D_CM4) += mach-imx7d-cm4.o

obj-$(CONFIG_SOC_IMX7ULP) += mach-imx7ulp.o pm-imx7ulp.o



ifeq ($(CONFIG_SUSPEND),y)

AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a

arch/arm/mach-imx/common.h

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ void imx6dl_pm_init(void); 
void imx6sl_pm_init(void);

void imx6sx_pm_init(void);

void imx6ul_pm_init(void);

void imx7ulp_pm_init(void);



#ifdef CONFIG_PM

void imx51_pm_init(void);

arch/arm/mach-imx/cpu.c

+3 −0
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ struct device * __init imx_soc_device_init(void) 
	case MXC_CPU_IMX7D:

		soc_id = "i.MX7D";

		break;

	case MXC_CPU_IMX7ULP:

		soc_id = "i.MX7ULP";

		break;

	default:

		soc_id = "Unknown";

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE