Commit 19cfdfd6 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'v4.13-rockchip-soc32-1' of...

Merge tag 'v4.13-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc

Add support for the RV1108 and its debug uart

* tag 'v4.13-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: enable support for RV1108 SoC
  ARM: debug: add low level debug uart for rv1108
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7c3b54a5 51f6bfc7
...@@ -776,6 +776,30 @@ choice ...@@ -776,6 +776,30 @@ choice
their output to the standard serial port on the RealView their output to the standard serial port on the RealView
PB1176 platform. PB1176 platform.
config DEBUG_RV1108_UART0
bool "Kernel low-level debugging messages via Rockchip RV1108 UART0"
depends on ARCH_ROCKCHIP
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on Rockchip RV1108 based platforms.
config DEBUG_RV1108_UART1
bool "Kernel low-level debugging messages via Rockchip RV1108 UART1"
depends on ARCH_ROCKCHIP
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on Rockchip RV1108 based platforms.
config DEBUG_RV1108_UART2
bool "Kernel low-level debugging messages via Rockchip RV1108 UART2"
depends on ARCH_ROCKCHIP
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on Rockchip RV1108 based platforms.
config DEBUG_RK29_UART0 config DEBUG_RK29_UART0
bool "Kernel low-level debugging messages via Rockchip RK29 UART0" bool "Kernel low-level debugging messages via Rockchip RK29 UART0"
depends on ARCH_ROCKCHIP depends on ARCH_ROCKCHIP
...@@ -1465,6 +1489,9 @@ config DEBUG_UART_PHYS ...@@ -1465,6 +1489,9 @@ config DEBUG_UART_PHYS
default 0x10126000 if DEBUG_RK3X_UART1 default 0x10126000 if DEBUG_RK3X_UART1
default 0x101f1000 if DEBUG_VERSATILE default 0x101f1000 if DEBUG_VERSATILE
default 0x101fb000 if DEBUG_NOMADIK_UART default 0x101fb000 if DEBUG_NOMADIK_UART
default 0x10210000 if DEBUG_RV1108_UART2
default 0x10220000 if DEBUG_RV1108_UART1
default 0x10230000 if DEBUG_RV1108_UART0
default 0x11002000 if DEBUG_MT8127_UART0 default 0x11002000 if DEBUG_MT8127_UART0
default 0x11006000 if DEBUG_MT6589_UART0 default 0x11006000 if DEBUG_MT6589_UART0
default 0x11009000 if DEBUG_MT8135_UART3 default 0x11009000 if DEBUG_MT8135_UART3
...@@ -1563,6 +1590,9 @@ config DEBUG_UART_PHYS ...@@ -1563,6 +1590,9 @@ config DEBUG_UART_PHYS
config DEBUG_UART_VIRT config DEBUG_UART_VIRT
hex "Virtual base address of debug UART" hex "Virtual base address of debug UART"
default 0xc881f000 if DEBUG_RV1108_UART2
default 0xc8821000 if DEBUG_RV1108_UART1
default 0xc8912000 if DEBUG_RV1108_UART0
default 0xe0000a00 if DEBUG_NETX_UART default 0xe0000a00 if DEBUG_NETX_UART
default 0xe0010fe0 if ARCH_RPC default 0xe0010fe0 if ARCH_RPC
default 0xf0000be0 if ARCH_EBSA110 default 0xf0000be0 if ARCH_EBSA110
......
...@@ -70,6 +70,7 @@ static const char * const rockchip_board_dt_compat[] = { ...@@ -70,6 +70,7 @@ static const char * const rockchip_board_dt_compat[] = {
"rockchip,rk3188", "rockchip,rk3188",
"rockchip,rk3228", "rockchip,rk3228",
"rockchip,rk3288", "rockchip,rk3288",
"rockchip,rv1108",
NULL, NULL,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment