Commit 3a4252da authored by Olof Johansson's avatar Olof Johansson
Browse files

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

This pull request contains Broadcom ARM-based SoCs Kconfig/machine
changes for 5.6, please pull the following:

- Justin adds an entry for BCM7216's debug UART to support DEBUG_LL
- Florian adds a select ARM_AMBA to support the ARM PL011 UART/console
  which is required on BCM7211

* tag 'arm-soc/for-5.6/soc' of https://github.com/Broadcom/stblinux:
  ARM: bcm: Select ARM_AMBA for ARCH_BRCMSTB
  ARM: brcmstb: Add debug UART entry for 7216

Link: https://lore.kernel.org/r/20200108191114.15987-3-f.fainelli@gmail.com


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

arch/arm/include/debug/brcmstb.S

+13 −11
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#define UARTA_7268		UARTA_7255

#define UARTA_7271		UARTA_7268

#define UARTA_7278		REG_PHYS_ADDR_V7(0x40c000)

#define UARTA_7216		UARTA_7278

#define UARTA_7364		REG_PHYS_ADDR(0x40b000)

#define UARTA_7366		UARTA_7364

#define UARTA_74371		REG_PHYS_ADDR(0x406b00)
@@ -82,17 +83,18 @@ ARM_BE8( rev \rv, \rv ) 


		/* Chip specific detection starts here */

20:		checkuart(\rp, \rv, 0x33900000, 3390)

21:		checkuart(\rp, \rv, 0x72500000, 7250)

22:		checkuart(\rp, \rv, 0x72550000, 7255)

23:		checkuart(\rp, \rv, 0x72600000, 7260)

24:		checkuart(\rp, \rv, 0x72680000, 7268)

25:		checkuart(\rp, \rv, 0x72710000, 7271)

26:		checkuart(\rp, \rv, 0x72780000, 7278)

27:		checkuart(\rp, \rv, 0x73640000, 7364)

28:		checkuart(\rp, \rv, 0x73660000, 7366)

29:		checkuart(\rp, \rv, 0x07437100, 74371)

30:		checkuart(\rp, \rv, 0x74390000, 7439)

31:		checkuart(\rp, \rv, 0x74450000, 7445)

21:		checkuart(\rp, \rv, 0x72160000, 7216)

22:		checkuart(\rp, \rv, 0x72500000, 7250)

23:		checkuart(\rp, \rv, 0x72550000, 7255)

24:		checkuart(\rp, \rv, 0x72600000, 7260)

25:		checkuart(\rp, \rv, 0x72680000, 7268)

26:		checkuart(\rp, \rv, 0x72710000, 7271)

27:		checkuart(\rp, \rv, 0x72780000, 7278)

28:		checkuart(\rp, \rv, 0x73640000, 7364)

29:		checkuart(\rp, \rv, 0x73660000, 7366)

30:		checkuart(\rp, \rv, 0x07437100, 74371)

31:		checkuart(\rp, \rv, 0x74390000, 7439)

32:		checkuart(\rp, \rv, 0x74450000, 7445)



		/* No valid UART found */

90:		mov	\rp, #0

arch/arm/mach-bcm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ config ARCH_BRCMSTB 
	bool "Broadcom BCM7XXX based boards"

	depends on ARCH_MULTI_V7

	select ARCH_HAS_RESET_CONTROLLER

	select ARM_AMBA

	select ARM_GIC

	select ARM_ERRATA_798181 if SMP

	select HAVE_ARM_ARCH_TIMER

CRA Git | Maintained and supported by SUSTech CRA and CCSE