github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 11:33:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

i.MX SoC update for 5.17:

Browse Source 
- 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.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAmG9eRkUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM4Ggwf9Fquqf5HlMGRg4DjTuJqeZL1Gaj2+
 BMeSsCYhVxiWhxp1HD8gEhJbJKpLgv5HApSlXvcqAyLNbG+4YqrI+u5In1HFkiV3
 KYZQCE1PPKOvDgM7Yopn9yvdj6NB6xCVmR1XxxFPZpMHvZn0uoefoEpzSqnS7BcC
 qJaoq1hcuMytDOgmzhJBOrrUzHJBkAno4w5zV9i4V5b+OFPFgESasuj4GXjQnRvZ
 blE87CnrgbI6zKJTfSWKO0r2YMFzp4RdQhTC/7WbtWLo5iuj+VpgfdHlrpldfapF
 XJPftmONJob4tEngfWyLW9CpSPzG0C/9jns3+xH/BHtOdshU/Ou4k/mIlw==
 =79Mw
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmHAoZ4ACgkQmmx57+YA
 GNm7OxAAjIkhtPtp8sgN32ixWSP3UaTfUDQst4xWvVK/emWpZCVb70h+UwpOjtEa
 t0d5cj+LZCl0ZtKHNDVz98ztSLVLQqCY/qDaU3Qkm0Y5PXH9aZHh7k+A5UOVBdd6
 SVIC09uFfawz5sQVUkKaM4i4uDAUzQQ/zbnL4BmY2i9ZYmeYjuOjpdCpz9ptzVN9
 mJfwwiyCAFK2rTscXVBz2gxGqpaiHQWaR6fj2OvjxFwetM80U/6U/qJiw+FNwjAa
 BXghkeNv448VMnHhG0hnt5MUGpSnPGemRu53Dv+R4cU/fuEDaDuCSo8ljtZrhhw6
 YdmXbbOzE2A5NslLVFai+X6/72/EGWWLmwL3Armm0YuYuP6EgZzMZfCVTpP3Sy/s
 ofZs8NuWZINk+OyFjOW2wlYuvC8g9gRQYw6m1xHY16PpJP9dbScO8pBtX0vhELYY
 BuUIwFYdTO/NeIYwqCE2NCbebn5vERZ1sKRmvMu7oUXmM+HJbF2Xp2QL63XYouSa
 xCLjEax2f8Nyu4ilw9ltLG7jWDp8mVX/vAeQTsMkuHeZ7Ev2Pfl57PHl/hGuGLpS
 ej85uhmcXwf9XurY4yhI20l+7AtNhrx05KOsaqA5+gh5pKMS/nE4yiY79B3Kvhmn
 DPA/a8lAYc7YcKjBrNwPDXcMC+6lVU7EQUUYydEuLKvP2TfDOr4=
 =YWKR
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-12-20 16:30:38 +01:00
commit 9193b2b75e
4 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/Kconfig.debug
View File

@ -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,12 +1540,12 @@ 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 || \
DEBUG_IMX51_UART || \
DEBUG_IMX53_UART ||\
DEBUG_IMX53_UART || \
DEBUG_IMX6Q_UART || \
DEBUG_IMX6SL_UART || \
DEBUG_IMX6SX_UART || \

18
arch/arm/include/debug/imx-uart.h
View File

@ -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)

12
arch/arm/mach-imx/Kconfig
View File

@ -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

2
arch/arm/mach-imx/Makefile
View File

@ -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