leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hisilicon ARM SoC updates for v5.10

Browse Source 
- Add SD5203 SoC support which core is ARM926EJ-S
 - Add Low-level debugging support for SD5203
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJfc+uRAAoJEAvIV27ZiWZcPG4P/0p72V80ykjr2vd1QTmoZ/6i
 pM6psJEQL5+QFMM7zgTyHJxxVZVLzQhZRM1SicfDgBKsj2PV8A1XXbLoMT8gJIl8
 IDpU08REAS7s+7+32Apzz33jS/s24yd0EMHHcI3+4d/ggOrmUAmo9NeEAFBbDboy
 ygD4VyLTaBcgDoqS+/GCmrVR5HbTeBm0l92t+L6o9XU0kr+u7zqvX+ajIWgrEDFM
 eizb0h03paMDRsIrZDmWq0Y5k8tOqyKpdw5L6mEHfl30jR/fxEFyFmh/jZ8jeUnV
 qlOaVfNJ8XVILDJfJNzDZBhJUyQVJqrrDjHtpSOl0b73M89OezcR9VfGb7l6Kd7D
 Vps77or7JCQTYpjj4LKyT8V2p5aAlI78NhzUXQTz0AkwurMAQZHQI7uMsY0/NwfK
 0f3TNL/HrxJimqWcTVmLq4N8Go9+KY20DTg5LlqGsLY4gugqEBsW26pOEbcOTOM8
 O7uQTi0aSFagszKZoYWa8BijLk6G3OEBjpMBCIP3lLByjWBKsywiw5YiTQOrV3XV
 ySZtoN/8HtjfPmeYouapdt9tEJiymgcxXJ33TEvaFh6nFcGerI5EeB/KXLVEGc8B
 Te7jXPM+4qcmY7Xo0ybKqHDlj2B+rBInN0l3esS3udxMxC09jPAO1nbV0jI3PQBY
 ag0jxf9ZwLJQSbzl69B1
 =P/uk
 -----END PGP SIGNATURE-----

Merge tag 'hisi-arm-soc-for-5.10' of git://github.com/hisilicon/linux-hisi into arm/soc

Hisilicon ARM SoC updates for v5.10

- Add SD5203 SoC support which core is ARM926EJ-S
- Add Low-level debugging support for SD5203

* tag 'hisi-arm-soc-for-5.10' of git://github.com/hisilicon/linux-hisi:
  ARM: debug: add UART early console support for SD5203
  ARM: hisi: add support for SD5203 SoC

Link: https://lore.kernel.org/r/5F742928.2060202@hisilicon.com
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2020-10-03 13:15:38 -07:00
commit a4f07008bf
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/Kconfig.debug
View File

@ -1086,6 +1086,14 @@ choice
on SA-11x0 UART ports. The kernel will check for the first on SA-11x0 UART ports. The kernel will check for the first
enabled UART in a sequence 3-1-2. enabled UART in a sequence 3-1-2.
config DEBUG_SD5203_UART
bool "Hisilicon SD5203 Debug UART"
depends on ARCH_SD5203
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on SD5203 UART.
config DEBUG_SOCFPGA_UART0 config DEBUG_SOCFPGA_UART0
depends on ARCH_SOCFPGA depends on ARCH_SOCFPGA
bool "Use SOCFPGA UART0 for low-level debug" bool "Use SOCFPGA UART0 for low-level debug"
@ -1649,6 +1657,7 @@ config DEBUG_UART_PHYS
default 0x11006000 if DEBUG_MT6589_UART0 default 0x11006000 if DEBUG_MT6589_UART0
default 0x11009000 if DEBUG_MT8135_UART3 default 0x11009000 if DEBUG_MT8135_UART3
default 0x16000000 if DEBUG_INTEGRATOR default 0x16000000 if DEBUG_INTEGRATOR
default 0x1600d000 if DEBUG_SD5203_UART
default 0x18000300 if DEBUG_BCM_5301X default 0x18000300 if DEBUG_BCM_5301X
default 0x18000400 if DEBUG_BCM_HR2 default 0x18000400 if DEBUG_BCM_HR2
default 0x18010000 if DEBUG_SIRFATLAS7_UART0 default 0x18010000 if DEBUG_SIRFATLAS7_UART0
@ -1851,7 +1860,7 @@ config DEBUG_UART_VIRT
default 0xfec60000 if DEBUG_SIRFPRIMA2_UART1 default 0xfec60000 if DEBUG_SIRFPRIMA2_UART1
default 0xfec90000 if DEBUG_RK32_UART2 default 0xfec90000 if DEBUG_RK32_UART2
default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1 default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2 default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_SD5203_UART
default 0xfed60000 if DEBUG_RK29_UART0 default 0xfed60000 if DEBUG_RK29_UART0
default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2 default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3 default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3

16
arch/arm/mach-hisi/Kconfig
View File

@ -1,9 +1,9 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config ARCH_HISI config ARCH_HISI
bool "Hisilicon SoC Support" bool "Hisilicon SoC Support"
depends on ARCH_MULTI_V7 depends on ARCH_MULTI_V7 || ARCH_MULTI_V5
select ARM_AMBA select ARM_AMBA
select ARM_GIC select ARM_GIC if ARCH_MULTI_V7
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select POWER_RESET select POWER_RESET
select POWER_RESET_HISI select POWER_RESET_HISI
@ -15,6 +15,7 @@ menu "Hisilicon platform type"
config ARCH_HI3xxx config ARCH_HI3xxx
bool "Hisilicon Hi36xx family" bool "Hisilicon Hi36xx family"
depends on ARCH_MULTI_V7
select CACHE_L2X0 select CACHE_L2X0
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
@ -25,6 +26,7 @@ config ARCH_HI3xxx
config ARCH_HIP01 config ARCH_HIP01
bool "Hisilicon HIP01 family" bool "Hisilicon HIP01 family"
depends on ARCH_MULTI_V7
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select ARM_GLOBAL_TIMER select ARM_GLOBAL_TIMER
@ -33,6 +35,7 @@ config ARCH_HIP01
config ARCH_HIP04 config ARCH_HIP04
bool "Hisilicon HiP04 Cortex A15 family" bool "Hisilicon HiP04 Cortex A15 family"
depends on ARCH_MULTI_V7
select ARM_ERRATA_798181 if SMP select ARM_ERRATA_798181 if SMP
select HAVE_ARM_ARCH_TIMER select HAVE_ARM_ARCH_TIMER
select MCPM if SMP select MCPM if SMP
@ -43,6 +46,7 @@ config ARCH_HIP04
config ARCH_HIX5HD2 config ARCH_HIX5HD2
bool "Hisilicon X5HD2 family" bool "Hisilicon X5HD2 family"
depends on ARCH_MULTI_V7
select CACHE_L2X0 select CACHE_L2X0
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
@ -50,6 +54,14 @@ config ARCH_HIX5HD2
select PINCTRL_SINGLE select PINCTRL_SINGLE
help help
Support for Hisilicon HIX5HD2 SoC family Support for Hisilicon HIX5HD2 SoC family
config ARCH_SD5203
bool "Hisilicon SD5203 family"
depends on ARCH_MULTI_V5
select DW_APB_ICTL
help
Support for Hisilicon SD5203 SoC family
endmenu endmenu
endif endif