Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd8ba523 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-4.19/soc' of https://github.com/Broadcom/stblinux into next/soc 

This pull request contains Broadcom ARM-based SoCs platform changes for
4.19, please pull the following:

- Clement re-orders the UART debug entries to be in ascending order and
  he also adds the iProc UART3 debug address since that is a common
  location for iProc based designs.

* tag 'arm-soc/for-4.19/soc' of https://github.com/Broadcom/stblinux

:
  ARM: debug: fix BCM2836 order entry
  ARM: debug: Add iProc UART3 debug addresses

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a67de882 f3f49e42

arch/arm/Kconfig.debug

+12 −2
Original line number Diff line number Diff line
@@ -207,6 +207,14 @@ choice 
		depends on ARCH_BCM_HR2

		select DEBUG_UART_8250



	config DEBUG_BCM_IPROC_UART3

		bool "Kernel low-level debugging on BCM IPROC UART3"

		depends on ARCH_BCM_CYGNUS

		select DEBUG_UART_8250

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the third serial port on these devices.



	config DEBUG_BCM_KONA_UART

		bool "Kernel low-level debugging messages via BCM KONA UART"

		depends on ARCH_BCM_MOBILE
@@ -1565,14 +1573,15 @@ config DEBUG_UART_PHYS 
	default 0x18000400 if DEBUG_BCM_HR2

	default 0x18010000 if DEBUG_SIRFATLAS7_UART0

	default 0x18020000 if DEBUG_SIRFATLAS7_UART1

	default 0x18023000 if DEBUG_BCM_IPROC_UART3

	default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1

	default 0x20001000 if DEBUG_HIP01_UART

	default 0x20060000 if DEBUG_RK29_UART0

	default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2

	default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3

	default 0x20201000 if DEBUG_BCM2835

	default 0x3f201000 if DEBUG_BCM2836

	default 0x3e000000 if DEBUG_BCM_KONA_UART

	default 0x3f201000 if DEBUG_BCM2836

	default 0x4000e400 if DEBUG_LL_UART_EFM32

	default 0x40028000 if DEBUG_AT91_SAMV7_USART1

	default 0x40081000 if DEBUG_LPC18XX_UART0
@@ -1685,6 +1694,7 @@ config DEBUG_UART_VIRT 
	default 0xf1002000 if DEBUG_MT8127_UART0

	default 0xf1006000 if DEBUG_MT6589_UART0

	default 0xf1009000 if DEBUG_MT8135_UART3

	default 0xf1023000 if DEBUG_BCM_IPROC_UART3

	default 0xf11f1000 if DEBUG_VERSATILE

	default 0xf1600000 if DEBUG_INTEGRATOR

	default 0xf1c28000 if DEBUG_SUNXI_UART0
@@ -1800,7 +1810,7 @@ config DEBUG_UART_8250_WORD 
		DEBUG_KEYSTONE_UART0 || DEBUG_KEYSTONE_UART1 || \

		DEBUG_ALPINE_UART0 || \

		DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \

		DEBUG_DAVINCI_DA8XX_UART2 || \

		DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_BCM_IPROC_UART3 || \

		DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2



config DEBUG_UART_8250_PALMCHIP