Unverified Commit 9193b2b7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX SoC update for 5.17:

- A couple of cleanups from Lukas Bulwahn to remove left-over from
  i.MX{27,31,35} board file removal, and rename DEBUG_IMX21_IMX27_UART
  to DEBUG_IMX27_UART.

* tag 'imx-soc-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: rename DEBUG_IMX21_IMX27_UART to DEBUG_IMX27_UART
  ARM: imx: remove dead left-over from i.MX{27,31,35} removal

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4d4872fe b0100bce

arch/arm/Kconfig.debug

+7 −7
Original line number Diff line number Diff line
@@ -410,12 +410,12 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on i.MX25.



	config DEBUG_IMX21_IMX27_UART

		bool "i.MX21 and i.MX27 Debug UART"

		depends on SOC_IMX21 || SOC_IMX27

	config DEBUG_IMX27_UART

		bool "i.MX27 Debug UART"

		depends on SOC_IMX27

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX21 or i.MX27.

		  on i.MX27.



	config DEBUG_IMX28_UART

		bool "i.MX28 Debug UART"
@@ -1481,7 +1481,7 @@ config DEBUG_IMX_UART_PORT 
	int "i.MX Debug UART Port Selection"

	depends on DEBUG_IMX1_UART || \

		   DEBUG_IMX25_UART || \

		   DEBUG_IMX21_IMX27_UART || \

		   DEBUG_IMX27_UART || \

		   DEBUG_IMX31_UART || \

		   DEBUG_IMX35_UART || \

		   DEBUG_IMX50_UART || \
@@ -1540,7 +1540,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/icedcc.S" if DEBUG_ICEDCC

	default "debug/imx.S" if DEBUG_IMX1_UART || \

				 DEBUG_IMX25_UART || \

				 DEBUG_IMX21_IMX27_UART || \

				 DEBUG_IMX27_UART || \

				 DEBUG_IMX31_UART || \

				 DEBUG_IMX35_UART || \

				 DEBUG_IMX50_UART || \

arch/arm/include/debug/imx-uart.h

+9 −9
Original line number Diff line number Diff line
@@ -11,13 +11,6 @@ 
#define IMX1_UART_BASE_ADDR(n)	IMX1_UART##n##_BASE_ADDR

#define IMX1_UART_BASE(n)	IMX1_UART_BASE_ADDR(n)



#define IMX21_UART1_BASE_ADDR	0x1000a000

#define IMX21_UART2_BASE_ADDR	0x1000b000

#define IMX21_UART3_BASE_ADDR	0x1000c000

#define IMX21_UART4_BASE_ADDR	0x1000d000

#define IMX21_UART_BASE_ADDR(n)	IMX21_UART##n##_BASE_ADDR

#define IMX21_UART_BASE(n)	IMX21_UART_BASE_ADDR(n)



#define IMX25_UART1_BASE_ADDR	0x43f90000

#define IMX25_UART2_BASE_ADDR	0x43f94000

#define IMX25_UART3_BASE_ADDR	0x5000c000
@@ -26,6 +19,13 @@ 
#define IMX25_UART_BASE_ADDR(n)	IMX25_UART##n##_BASE_ADDR

#define IMX25_UART_BASE(n)	IMX25_UART_BASE_ADDR(n)



#define IMX27_UART1_BASE_ADDR	0x1000a000

#define IMX27_UART2_BASE_ADDR	0x1000b000

#define IMX27_UART3_BASE_ADDR	0x1000c000

#define IMX27_UART4_BASE_ADDR	0x1000d000

#define IMX27_UART_BASE_ADDR(n)	IMX27_UART##n##_BASE_ADDR

#define IMX27_UART_BASE(n)	IMX27_UART_BASE_ADDR(n)



#define IMX31_UART1_BASE_ADDR	0x43f90000

#define IMX31_UART2_BASE_ADDR	0x43f94000

#define IMX31_UART3_BASE_ADDR	0x5000c000
@@ -112,10 +112,10 @@ 


#ifdef CONFIG_DEBUG_IMX1_UART

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX1)

#elif defined(CONFIG_DEBUG_IMX21_IMX27_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX21)

#elif defined(CONFIG_DEBUG_IMX25_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX25)

#elif defined(CONFIG_DEBUG_IMX27_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX27)

#elif defined(CONFIG_DEBUG_IMX31_UART)

#define UART_PADDR	IMX_DEBUG_UART_BASE(IMX31)

#elif defined(CONFIG_DEBUG_IMX35_UART)

arch/arm/mach-imx/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -21,18 +21,6 @@ config MXC_TZIC 
config MXC_AVIC

	bool



config MXC_DEBUG_BOARD

	bool "Enable MXC debug board(for 3-stack)"

	depends on MACH_MX27_3DS || MACH_MX31_3DS || MACH_MX35_3DS

	help

	  The debug board is an integral part of the MXC 3-stack(PDK)

	  platforms, it can be attached or removed from the peripheral

	  board. On debug board, several debug devices(ethernet, UART,

	  buttons, LEDs and JTAG) are implemented. Between the MCU and

	  these devices, a CPLD is added as a bridge which performs

	  data/address de-multiplexing and decode, signal level shift,

	  interrupt control and various board functions.



config HAVE_IMX_ANATOP

	bool

arch/arm/mach-imx/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y) 
obj-$(CONFIG_MXC_TZIC) += tzic.o

obj-$(CONFIG_MXC_AVIC) += avic.o



obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o



ifeq ($(CONFIG_CPU_IDLE),y)

obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o

obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o