Merge tag 'imx-soc-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorOlof Johansson <olof@lixom.net>
Wed, 12 Dec 2018 21:52:48 +0000 (13:52 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 12 Dec 2018 21:52:48 +0000 (13:52 -0800)
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: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/Kconfig.debug

diff --combined arch/arm/Kconfig.debug
index e2afacba6bc2f78870017c6687d8fe8a0b7aca8f,c253a4e79868b0583d721d884c12922dad3f43ea..6d6e0330930b52f7369a46536473fa7174fad2d9
@@@ -1087,21 -1087,14 +1087,21 @@@ choic
                  Say Y here if you want kernel low-level debugging support
                  on SOCFPGA(Cyclone 5 and Arria 5) based platforms.
  
 -      config DEBUG_SOCFPGA_UART1
 +      config DEBUG_SOCFPGA_ARRIA10_UART1
                depends on ARCH_SOCFPGA
 -              bool "Use SOCFPGA UART1 for low-level debug"
 +              bool "Use SOCFPGA Arria10 UART1 for low-level debug"
                select DEBUG_UART_8250
                help
                  Say Y here if you want kernel low-level debugging support
                  on SOCFPGA(Arria 10) based platforms.
  
 +      config DEBUG_SOCFPGA_CYCLONE5_UART1
 +              depends on ARCH_SOCFPGA
 +              bool "Use SOCFPGA Cyclone 5 UART1 for low-level debug"
 +              select DEBUG_UART_8250
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on SOCFPGA(Cyclone 5 and Arria 5) based platforms.
  
        config DEBUG_SUN9I_UART0
                bool "Kernel low-level debugging messages via sun9i UART0"
  
                  If unsure, say N.
  
 +      config STM32F4_DEBUG_UART
 +              bool "Use STM32F4 UART for low-level debug"
 +              depends on ARCH_STM32
 +              select DEBUG_STM32_UART
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on STM32F4 based platforms, which default UART is wired on
 +                USART1.
 +
 +                If unsure, say N.
 +
 +      config STM32F7_DEBUG_UART
 +              bool "Use STM32F7 UART for low-level debug"
 +              depends on ARCH_STM32
 +              select DEBUG_STM32_UART
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on STM32F7 based platforms, which default UART is wired on
 +                USART1.
 +
 +                If unsure, say N.
 +
        config TEGRA_DEBUG_UART_AUTO_ODMDATA
                bool "Kernel low-level debugging messages via Tegra UART via ODMDATA"
                depends on ARCH_TEGRA
@@@ -1469,21 -1440,21 +1469,21 @@@ config DEBUG_OMAP2PLUS_UAR
        depends on ARCH_OMAP2PLUS
  
  config DEBUG_IMX_UART_PORT
-       int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \
-                                               DEBUG_IMX25_UART || \
-                                               DEBUG_IMX21_IMX27_UART || \
-                                               DEBUG_IMX31_UART || \
-                                               DEBUG_IMX35_UART || \
-                                               DEBUG_IMX50_UART || \
-                                               DEBUG_IMX51_UART || \
-                                               DEBUG_IMX53_UART || \
-                                               DEBUG_IMX6Q_UART || \
-                                               DEBUG_IMX6SL_UART || \
-                                               DEBUG_IMX6SX_UART || \
-                                               DEBUG_IMX6UL_UART || \
-                                               DEBUG_IMX7D_UART
+       int "i.MX Debug UART Port Selection"
+       depends on DEBUG_IMX1_UART || \
+                  DEBUG_IMX25_UART || \
+                  DEBUG_IMX21_IMX27_UART || \
+                  DEBUG_IMX31_UART || \
+                  DEBUG_IMX35_UART || \
+                  DEBUG_IMX50_UART || \
+                  DEBUG_IMX51_UART || \
+                  DEBUG_IMX53_UART || \
+                  DEBUG_IMX6Q_UART || \
+                  DEBUG_IMX6SL_UART || \
+                  DEBUG_IMX6SX_UART || \
+                  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.
@@@ -1505,10 -1476,6 +1505,10 @@@ config DEBUG_STI_UAR
        bool
        depends on ARCH_STI
  
 +config DEBUG_STM32_UART
 +      bool
 +      depends on ARCH_STM32
 +
  config DEBUG_SIRFSOC_UART
        bool
        depends on ARCH_SIRF
@@@ -1558,7 -1525,6 +1558,7 @@@ config DEBUG_LL_INCLUD
        default "debug/s5pv210.S" if DEBUG_S5PV210_UART
        default "debug/sirf.S" if DEBUG_SIRFSOC_UART
        default "debug/sti.S" if DEBUG_STI_UART
 +      default "debug/stm32.S" if DEBUG_STM32_UART
        default "debug/tegra.S" if DEBUG_TEGRA_UART
        default "debug/ux500.S" if DEBUG_UX500_UART
        default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT
@@@ -1689,8 -1655,7 +1689,8 @@@ config DEBUG_UART_PHY
        default 0xfe800000 if ARCH_IOP32X
        default 0xff690000 if DEBUG_RK32_UART2
        default 0xffc02000 if DEBUG_SOCFPGA_UART0
 -      default 0xffc02100 if DEBUG_SOCFPGA_UART1
 +      default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1
 +      default 0xffc03000 if DEBUG_SOCFPGA_CYCLONE5_UART1
        default 0xffd82340 if ARCH_IOP13XX
        default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0
        default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2
@@@ -1797,8 -1762,7 +1797,8 @@@ config DEBUG_UART_VIR
        default 0xfeb30c00 if DEBUG_KEYSTONE_UART0
        default 0xfeb31000 if DEBUG_KEYSTONE_UART1
        default 0xfec02000 if DEBUG_SOCFPGA_UART0
 -      default 0xfec02100 if DEBUG_SOCFPGA_UART1
 +      default 0xfec02100 if DEBUG_SOCFPGA_ARRIA10_UART1
 +      default 0xfec03000 if DEBUG_SOCFPGA_CYCLONE5_UART1
        default 0xfec12000 if (DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE) && ARCH_MVEBU
        default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE
        default 0xfec10000 if DEBUG_SIRFATLAS7_UART0
@@@ -1847,9 -1811,9 +1847,9 @@@ config DEBUG_UART_8250_WOR
        depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
        depends on DEBUG_UART_8250_SHIFT >= 2
        default y if DEBUG_PICOXCELL_UART || \
 -              DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_UART1 || \
 -              DEBUG_KEYSTONE_UART0 || DEBUG_KEYSTONE_UART1 || \
 -              DEBUG_ALPINE_UART0 || \
 +              DEBUG_SOCFPGA_UART0 || DEBUG_SOCFPGA_ARRIA10_UART1 || \
 +              DEBUG_SOCFPGA_CYCLONE5_UART1 || DEBUG_KEYSTONE_UART0 || \
 +              DEBUG_KEYSTONE_UART1 || DEBUG_ALPINE_UART0 || \
                DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \
                DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_BCM_IPROC_UART3 || \
                DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2