This pull request contains Broadcom ARM-based SoC changes for 4.15 (second

part), please pull the following:
 
 - Florian adds support for the Broadcom Hurricane 2 SoC machine entry point
   and defines the debug UART address for use with earlyprintk/DEBUG_LL
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJZ6otTAAoJEIfQlpxEBwcEO8MP/31sG8GF6YLjezPZI4VGdJMN
 n9Fgvy0DjNTXExq158fx+DllP3ecpWF8yimXuE/FO3LBauOfVKFpLKwh10GJFTmS
 3TsI37sKQj5MgaTuVGW1otnQIoupX3Teze9MyquHooEY69Xwsehyo1rfagfXNllb
 1STRE1uluChwlLIoLV3fY74U+bij9gxROMRU5MaG87z4tGgYXuO5nYCl7oaJCNZ1
 gPKUsUj5OZD5OTDnE4qXyPEgR7bUr6wemLYYlfu0LOKOCHTfALV7pfJmXmeLF70z
 5G65BT5eSBa8nAb28Z7LjUiwipSiHiam9jnmiiG5LRoXQ8NKeQmfyrF++ljUlk19
 MurzmZIEdCVRk+Htxohf2PyBc+TvgDJ0Wy9rp6h8k18KeJvmlT4z4CHg1QFTyr4F
 u6PC8i1TCtb53iqbXixu1ax60X5L/ygRyNfvk7R7VU45VIjnMb9IoAZdoqYYj5Gh
 yXNuyEXDRMLfvc5niE9lSTeDw+2Hby1ZO3+M6l15cIJ4z4s/kzQOnbpzxnOFwK5n
 0xLhOTsMFNuvJImU6v/slzX8pM2JFgEebKImzBq2ybF3Gnh+sv9kZf+RmZtAhiH0
 h56BIN5v2lSv8EkT64t6cfwm58HqXI6bAKuUHTdwe+vbDeW4CkT1NJaF7KzlYULy
 mmLleC8JdOWrBNFUC2Tn
 =OjEl
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.15/soc-part2' of http://github.com/Broadcom/stblinux into next/soc

Pull "Broadcom soc changes for 4.15 (part 2)" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoC changes for 4.15 (second
part), please pull the following:

- Florian adds support for the Broadcom Hurricane 2 SoC machine entry point
  and defines the debug UART address for use with earlyprintk/DEBUG_LL

* tag 'arm-soc/for-4.15/soc-part2' of http://github.com/Broadcom/stblinux:
  ARM: debug: Add Hurricane 2 UART2 debug addresses
  ARM: bcm: Add support for Broadcom Hurricane 2 SoC

arch/arm/Kconfig.debug

@@ -169,6 +169,11 @@ choice
 		depends on ARCH_BCM_5301X || ARCH_BCM_NSP
 		select DEBUG_UART_8250
 
+	config DEBUG_BCM_HR2
+		bool "Kernel low-level debugging on Hurricane 2 UART2"
+		depends on ARCH_BCM_HR2
+		select DEBUG_UART_8250
+
 	config DEBUG_BCM_KONA_UART
 		bool "Kernel low-level debugging messages via BCM KONA UART"
 		depends on ARCH_BCM_MOBILE
@@ -1516,6 +1521,7 @@ config DEBUG_UART_PHYS
 	default 0x11009000 if DEBUG_MT8135_UART3
 	default 0x16000000 if DEBUG_INTEGRATOR
 	default 0x18000300 if DEBUG_BCM_5301X
+	default 0x18000400 if DEBUG_BCM_HR2
 	default 0x18010000 if DEBUG_SIRFATLAS7_UART0
 	default 0x18020000 if DEBUG_SIRFATLAS7_UART1
 	default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1
@@ -1633,6 +1639,7 @@ config DEBUG_UART_VIRT
 	default 0xf01fb000 if DEBUG_NOMADIK_UART
 	default 0xf0201000 if DEBUG_BCM2835 || DEBUG_BCM2836
 	default 0xf1000300 if DEBUG_BCM_5301X
+	default 0xf1000400 if DEBUG_BCM_HR2
 	default 0xf1002000 if DEBUG_MT8127_UART0
 	default 0xf1006000 if DEBUG_MT6589_UART0
 	default 0xf1009000 if DEBUG_MT8135_UART3
@@ -1738,7 +1745,8 @@ config DEBUG_UART_8250_SHIFT
 	int "Register offset shift for the 8250 debug UART"
 	depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
 	default 0 if DEBUG_FOOTBRIDGE_COM1 || ARCH_IOP32X || DEBUG_BCM_5301X || \
-		DEBUG_OMAP7XXUART1 || DEBUG_OMAP7XXUART2 || DEBUG_OMAP7XXUART3
+		DEBUG_BCM_HR2 || DEBUG_OMAP7XXUART1 || DEBUG_OMAP7XXUART2 || \
+		DEBUG_OMAP7XXUART3
 	default 2
 
 config DEBUG_UART_8250_WORD

arch/arm/mach-bcm/Kconfig

@@ -36,6 +36,15 @@ config ARCH_BCM_CYGNUS
 	  BCM11300, BCM11320, BCM11350, BCM11360,
 	  BCM58300, BCM58302, BCM58303, BCM58305.
 
+config ARCH_BCM_HR2
+	bool "Broadcom Hurricane 2 SoC support"
+	depends on ARCH_MULTI_V7
+	select ARCH_BCM_IPROC
+	help
+	  Enable support for the Hurricane 2 family,
+	  which includes the following variants:
+	  BCM53342, BCM53343, BCM53344, BCM53346.
+
 config ARCH_BCM_NSP
 	bool "Broadcom Northstar Plus SoC Support"
 	depends on ARCH_MULTI_V7

arch/arm/mach-bcm/Makefile

@@ -13,6 +13,9 @@
 # Cygnus
 obj-$(CONFIG_ARCH_BCM_CYGNUS) +=  bcm_cygnus.o
 
+# Hurricane 2
+obj-$(CONFIG_ARCH_BCM_HR2)	+= bcm_hr2.o
+
 # Northstar Plus
 obj-$(CONFIG_ARCH_BCM_NSP)	+= bcm_nsp.o
 

arch/arm/mach-bcm/bcm_hr2.c

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2017 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <asm/mach/arch.h>
+
+static const char * const bcm_hr2_dt_compat[] __initconst = {
+	"brcm,hr2",
+	NULL,
+};
+
+DT_MACHINE_START(BCM_HR2_DT, "Broadcom Hurricane 2 SoC")
+	.l2c_aux_val	= 0,
+	.l2c_aux_mask	= ~0,
+	.dt_compat = bcm_hr2_dt_compat,
+MACHINE_END