Commit 1305eda7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC platform updates from Olof Johansson:
 "Updates for new platform support:

   - New platform: Tango4 from Sigma Designs.
   - Broadcom BCM2836 (Raspberry Pi 2 SoC)
   - Enable cpufreq on Freescale i.MX7D
   - Rockchip: SMP support for rk3036, general support for rk3228
   - SMP support on Broadcom Kona and NSP
   - Cleanups for OMAP removing legacy IOMMU data

  + a bunch of misc fixes and tweaks for various platforms"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (46 commits)
  ARM: tango: Fix UP build issues
  ARM: tango: pass ARM arch level for smc.S
  ARM: bcm2835: Add Kconfig support for bcm2836
  ARM: OMAP2+: Add support for dm814x and dra62x usb
  ARM: OMAP2+: Add mmc hwmod entries for dm814x
  ARM: OMAP2+: Update 81xx clock and power domains for default, active and sgx
  ARM: OMAP2+: Fix SoC detection for dra62x j5-eco
  ARM: tango4: Initial platform support
  ARM: bcm2835: Add a compat string for bcm2836 machine probe
  dt-bindings: Add root properties for Raspberry Pi 2
  ARM: imx: select SRC for i.MX7
  ARM: uniphier: select PINCTRL
  ARM: OMAP2+: Remove device creation for omap-pcm-audio
  ARM: OMAP1: Remove device creation for omap-pcm-audio
  ARM: rockchip: enable support for RK3228 SoCs
  ARM: rockchip: use const and __initconst for rk3036 smp_operations
  ARM: zynq: Select ARCH_HAS_RESET_CONTROLLER
  ARM: BCM: Add SMP support for Broadcom 4708
  ARM: BCM: Add SMP support for Broadcom NSP
  ARM: BCM: Clean up SMP support for Broadcom Kona
  ...
parents 6b5a12db d6bd0579

Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ Raspberry Pi Model B+ 
Required root node properties:

compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";



Raspberry Pi 2 Model B

Required root node properties:

compatible = "raspberrypi,2-model-b", "brcm,bcm2836";



Raspberry Pi Compute Module

Required root node properties:

compatible = "raspberrypi,compute-module", "brcm,bcm2835";

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ nodes to be present and contain the properties described below. 
			    "qcom,gcc-msm8660"

			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v2"

			    "rockchip,rk3036-smp"

			    "rockchip,rk3066-smp"

			    "ste,dbx500-smp"

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1602,6 +1602,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git 
N:	stm32

F:	drivers/clocksource/armv7m_systick.c



ARM/TANGO ARCHITECTURE

M:	Marc Gonzalez <marc_gonzalez@sigmadesigns.com>

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	arch/arm/mach-tango/

F:	arch/arm/boot/dts/tango*



ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -831,6 +831,8 @@ source "arch/arm/mach-sunxi/Kconfig" 


source "arch/arm/mach-prima2/Kconfig"



source "arch/arm/mach-tango/Kconfig"



source "arch/arm/mach-tegra/Kconfig"



source "arch/arm/mach-u300/Kconfig"

arch/arm/Kconfig.debug

+8 −2
Original line number Diff line number Diff line
@@ -129,7 +129,12 @@ choice 


	config DEBUG_BCM2835

		bool "Kernel low-level debugging on BCM2835 PL011 UART"

		depends on ARCH_BCM2835

		depends on ARCH_BCM2835 && ARCH_MULTI_V6

		select DEBUG_UART_PL01X



	config DEBUG_BCM2836

		bool "Kernel low-level debugging on BCM2836 PL011 UART"

		depends on ARCH_BCM2835 && ARCH_MULTI_V7

		select DEBUG_UART_PL01X



	config DEBUG_BCM_5301X
@@ -1461,6 +1466,7 @@ config DEBUG_UART_PHYS 
	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 0x4000e400 if DEBUG_LL_UART_EFM32

	default 0x40081000 if DEBUG_LPC18XX_UART0
@@ -1547,7 +1553,7 @@ config DEBUG_UART_VIRT 
	default 0xf0000be0 if ARCH_EBSA110

	default 0xf0010000 if DEBUG_ASM9260_UART

	default 0xf01fb000 if DEBUG_NOMADIK_UART

	default 0xf0201000 if DEBUG_BCM2835

	default 0xf0201000 if DEBUG_BCM2835 || DEBUG_BCM2836

	default 0xf1000300 if DEBUG_BCM_5301X

	default 0xf1002000 if DEBUG_MT8127_UART0

	default 0xf1006000 if DEBUG_MT6589_UART0

CRA Git | Maintained and supported by SUSTech CRA and CCSE