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

Commit 825f4e02 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next 

Pull part one of ARM SoC updates from Olof Johansson:
 "A quite large set of SoC updates this cycle.  In no particular order:

   - Multi-cluster power management for Samsung Exynos, adding support
     for big.LITTLE CPU switching on EXYNOS5

   - SMP support for Marvell Armada 375 and 38x

   - SMP rework on Allwinner A31

   - Xilinx Zynq support for SOC_BUS, big endian

   - Marvell orion5x platform cleanup, modernizing the implementation
     and moving to DT.

   - _Finally_ moving Samsung Exynos over to support MULTIPLATFORM, so
     that their platform can be enabled in the same kernel binary as
     most of the other v7 platforms in the tree.  \o/

     The work isn't quite complete, there's some driver fixes still
     needed, but the basics now work.

  New SoC support added:

   - Freescale i.MX6SX

   - LSI Axxia AXM55xx SoCs

   - Samsung EXYNOS 3250, 5260, 5410, 5420 and 5800

   - STi STIH407

  plus a large set of various smaller updates for different platforms.
  I'm probably missing some important one here"

* tag 'soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (281 commits)
  ARM: exynos: don't run exynos4 l2x0 setup on other platforms
  ARM: exynos: Fix "allmodconfig" build errors in mcpm and hotplug
  ARM: EXYNOS: mcpm rename the power_down_finish
  ARM: EXYNOS: Enable mcpm for dual-cluster exynos5800 SoC
  ARM: EXYNOS: Enable multi-platform build support
  ARM: EXYNOS: Consolidate Kconfig entries
  ARM: EXYNOS: Add support for EXYNOS5410 SoC
  ARM: EXYNOS: Support secondary CPU boot of Exynos3250
  ARM: EXYNOS: Add Exynos3250 SoC ID
  ARM: EXYNOS: Add 5800 SoC support
  ARM: EXYNOS: initial board support for exynos5260 SoC
  clk: exynos5410: register clocks using common clock framework
  ARM: debug: qcom: add UART addresses to Kconfig help for APQ8084
  ARM: sunxi: allow building without reset controller
  Documentation: devicetree: arm: sort enable-method entries
  ARM: rockchip: convert smp bringup to CPU_METHOD_OF_DECLARE
  clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks
  ARM: dts: axxia: Add reset controller
  power: reset: Add Axxia system reset driver
  ARM: axxia: Adding defconfig for AXM55xx
  ...
parents 0a584715 b5b9324a

Documentation/arm/Marvell/README

+5 −0
Original line number Diff line number Diff line
@@ -234,6 +234,11 @@ Berlin family (Digital Entertainment) 
		Core:		Marvell PJ4B (ARMv7), Tauros3 L2CC

		Homepage:	http://www.marvell.com/digital-entertainment/armada-1500/

		Product Brief:	http://www.marvell.com/digital-entertainment/armada-1500/assets/Marvell-ARMADA-1500-Product-Brief.pdf

	88DE3114, Armada 1500 Pro

		Design name:	BG2-Q

		Core:		Quad Core ARM Cortex-A9, PL310 L2CC

		Homepage:	http://www.marvell.com/digital-entertainment/armada-1500-pro/

		Product Brief:	http://www.marvell.com/digital-entertainment/armada-1500-pro/assets/Marvell_ARMADA_1500_PRO-01_product_brief.pdf

	88DE????

		Design name:	BG3

		Core:		ARM Cortex-A15, CA15 integrated L2CC

Documentation/arm/sti/stih407-overview.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
			STiH407 Overview

			================



Introduction

------------



    The STiH407 is the new generation of SoC for Multi-HD, AVC set-top boxes

    and server/connected client application for satellite, cable, terrestrial

    and IP-STB markets.



    Features

    - ARM Cortex-A9 1.5 GHz dual core CPU (28nm)

    - SATA2, USB 3.0, PCIe, Gbit Ethernet



  Document Author

  ---------------



  Maxime Coquelin <maxime.coquelin@st.com>, (c) 2014 ST Microelectronics

Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt

+10 −9
Original line number Diff line number Diff line 
Power Management Service Unit(PMSU)

-----------------------------------

Available on Marvell SOCs: Armada 370 and Armada XP

Available on Marvell SOCs: Armada 370, Armada 38x and Armada XP



Required properties:



- compatible: "marvell,armada-370-xp-pmsu"

- compatible: should be one of:

  - "marvell,armada-370-pmsu" for Armada 370 or Armada XP

  - "marvell,armada-380-pmsu" for Armada 38x

  - "marvell,armada-370-xp-pmsu" was used for Armada 370/XP but is now

    deprecated and will be removed



- reg: Should contain PMSU registers location and length. First pair

  for the per-CPU SW Reset Control registers, second pair for the

  Power Management Service Unit.

- reg: Should contain PMSU registers location and length.



Example:



armada-370-xp-pmsu@d0022000 {

	compatible = "marvell,armada-370-xp-pmsu";

	reg = <0xd0022100 0x430>,

	      <0xd0020800 0x20>;

armada-370-xp-pmsu@22000 {

	compatible = "marvell,armada-370-pmsu";

	reg = <0x22000 0x1000>;

};

Documentation/devicetree/bindings/arm/armada-cpu-reset.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
Marvell Armada CPU reset controller

===================================



Required properties:



- compatible: Should be "marvell,armada-370-cpu-reset".



- reg: should be register base and length as documented in the

  datasheet for the CPU reset registers



cpurst: cpurst@20800 {

       compatible = "marvell,armada-370-cpu-reset";

       reg = <0x20800 0x20>;

};

Documentation/devicetree/bindings/arm/axxia.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Axxia AXM55xx device tree bindings



Boards using the AXM55xx SoC need to have the following properties:



Required root node property:



  - compatible = "lsi,axm5516"



Boards:



  LSI AXM5516 Validation board (Amarillo)

	compatible = "lsi,axm5516-amarillo", "lsi,axm5516"