Merge tag 'bcm63138-v4' of http://github.com/brcm/linux into next/soc

Merge "ARM: BCM: Broadcom BCM63138 support" from Florian Fainelli:

This patchset adds very minimal support for the BCM63138 SoC which is
a xDSL SoC using a dual Cortex A9 CPU complex.

* tag 'bcm63138-v4' of http://github.com/brcm/linux:
  MAINTAINERS: add entry for the Broadcom BCM63xx ARM SoCs
  ARM: BCM63XX: add BCM963138DVT Reference platform DTS
  ARM: BCM63XX: add BCM63138 minimal Device Tree
  ARM: BCM63XX: add low-level UART debug support
  ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC

Conflicts:
	arch/arm/Kconfig.debug

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig.debug
index 2dc9f6cd3c38d222d832c5f87db33966879ff3ad,07e9dd5eda26520dbb6f0698ed80f6df698c4426..22ebff9d781dd9243acc906a411eafe342d8c3ec
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1152,8 -1136,9 +1163,9 @@@ config DEBUG_UART_PHY
        default 0xfffff700 if ARCH_IOP33X
        depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
                DEBUG_LL_UART_EFM32 || \
 -              DEBUG_UART_8250 || DEBUG_UART_PL01X || \
 +              DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
-               DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART
+               DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
+               DEBUG_UART_BCM63XX
  
  config DEBUG_UART_VIRT
        hex "Virtual base address of debug UART"
@@@ -1223,8 -1206,9 +1236,9 @@@
        default 0xff003000 if DEBUG_U300_UART
        default DEBUG_UART_PHYS if !MMU
        depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
 -              DEBUG_UART_8250 || DEBUG_UART_PL01X || \
 +              DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
-               DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART
+               DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
+               DEBUG_UART_BCM63XX
  
  config DEBUG_UART_8250_SHIFT
        int "Register offset shift for the 8250 debug UART"

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/mach-bcm/Makefile
index b19a39652545daf3ca46243e29c7e7780fb27a91,cbbb0be54554d9e751cbed74ba3ca338a827573f..300ae4b79ae6343eeb17ca2abf899fb699b92b2b
--- 1/arch/arm/mach-bcm/Makefile
--- 2/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@@ -34,6 -34,10 +34,9 @@@ obj-$(CONFIG_ARCH_BCM2835)   += board_bcm
  # BCM5301X
  obj-$(CONFIG_ARCH_BCM_5301X)  += bcm_5301x.o
  
+ # BCM63XXx
+ obj-$(CONFIG_ARCH_BCM_63XX)   := bcm63xx.o
+ 
  ifeq ($(CONFIG_ARCH_BRCMSTB),y)
  obj-y                         += brcmstb.o
 -obj-$(CONFIG_SMP)             += headsmp-brcmstb.o platsmp-brcmstb.o
  endif