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

Commit e6c81cce 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:
 "Our SoC branch usually contains expanded support for new SoCs and
  other core platform code.  In this case, that includes:

   - support for the new Annapurna Labs "Alpine" platform

   - a rework greatly simplifying adding new platform support to the
     MCPM subsystem (Multi-cluster power management)

   - cpuidle and PM improvements for Exynos3250

   - misc updates for Renesas, OMAP, Meson, i.MX.  Some of these could
     have gone in other branches but ended up here for various reasons"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (53 commits)
  ARM: alpine: add support for generic pci
  ARM: Exynos: migrate DCSCB to the new MCPM backend abstraction
  ARM: vexpress: migrate DCSCB to the new MCPM backend abstraction
  ARM: vexpress: DCSCB: tighten CPU validity assertion
  ARM: vexpress: migrate TC2 to the new MCPM backend abstraction
  ARM: MCPM: move the algorithmic complexity to the core code
  ARM: EXYNOS: allow cpuidle driver usage on Exynos3250 SoC
  ARM: EXYNOS: add AFTR mode support for Exynos3250
  ARM: EXYNOS: add code for setting/clearing boot flag
  ARM: EXYNOS: fix CPU1 hotplug on Exynos3250
  ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore
  ARM: cygnus: fix const declaration bcm_cygnus_dt_compat
  ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
  ARM: DRA7: hwmod: Add data for GPTimers 13 through 16
  ARM: EXYNOS: Remove left over 'extra_save'
  ARM: EXYNOS: Constify exynos_pm_data array
  ARM: EXYNOS: use static in suspend.c
  ARM: EXYNOS: Use platform device name as power domain name
  ARM: EXYNOS: add support for async-bridge clocks for pm_domains
  ARM: omap-device: add missed callback for suspend-to-disk
  ...
parents d0440c59 a018bb2f

Documentation/arm/Marvell/README

+5 −0
Original line number Diff line number Diff line
@@ -96,6 +96,11 @@ EBU Armada family 
	88F6820

	88F6828



  Armada 390/398 Flavors:

	88F6920

	88F6928

    Product infos: http://www.marvell.com/embedded-processors/armada-39x/



  Armada XP Flavors:

        MV78230

        MV78260

Documentation/devicetree/bindings/arm/al,alpine.txt

0 → 100644
+88 −0
Original line number Diff line number Diff line 
Annapurna Labs Alpine Platform Device Tree Bindings

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



Boards in the Alpine family shall have the following properties:



* Required root node properties:

compatible: must contain "al,alpine"



* Example:



/ {

	model = "Annapurna Labs Alpine Dev Board";

	compatible = "al,alpine";



	...

}



* CPU node:



The Alpine platform includes cortex-a15 cores.

enable-method: must be "al,alpine-smp" to allow smp  [1]



Example:



cpus {

	#address-cells = <1>;

	#size-cells = <0>;

	enable-method = "al,alpine-smp";



	cpu@0 {

		compatible = "arm,cortex-a15";

		device_type = "cpu";

		reg = <0>;

	};



	cpu@1 {

		compatible = "arm,cortex-a15";

		device_type = "cpu";

		reg = <1>;

	};



	cpu@2 {

		compatible = "arm,cortex-a15";

		device_type = "cpu";

		reg = <2>;

	};



	cpu@3 {

		compatible = "arm,cortex-a15";

		device_type = "cpu";

		reg = <3>;

	};

};





* Alpine CPU resume registers



The CPU resume register are used to define required resume address after

reset.



Properties:

- compatible : Should contain "al,alpine-cpu-resume".

- reg : Offset and length of the register set for the device



Example:



cpu_resume {

	compatible = "al,alpine-cpu-resume";

	reg = <0xfbff5ed0 0x30>;

};



* Alpine System-Fabric Service Registers



The System-Fabric Service Registers allow various operation on CPU and

system fabric, like powering CPUs off.



Properties:

- compatible : Should contain "al,alpine-sysfabric-service" and "syscon".

- reg : Offset and length of the register set for the device



Example:



nb_service {

        compatible = "al,alpine-sysfabric-service", "syscon";

        reg = <0xfb070000 0x10000>;

};



[1] arm/cpu-enable-method/al,alpine-smp

Documentation/devicetree/bindings/arm/amlogic.txt

+4 −0
Original line number Diff line number Diff line
@@ -8,3 +8,7 @@ Boards with the Amlogic Meson6 SoC shall have the following properties: 
Boards with the Amlogic Meson8 SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,meson8";



Board compatible values:

  - "geniatech,atv1200"

  - "minix,neo-x8"

Documentation/devicetree/bindings/arm/armada-39x.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Marvell Armada 39x Platforms Device Tree Bindings

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



Boards with a SoC of the Marvell Armada 39x family shall have the

following property:



Required root node property:



 - compatible: must contain "marvell,armada390"



In addition, boards using the Marvell Armada 398 SoC shall have the

following property before the previous one:



Required root node property:



compatible: must contain "marvell,armada398"



Example:



compatible = "marvell,a398-db", "marvell,armada398", "marvell,armada390";

Documentation/devicetree/bindings/arm/cpu-enable-method/al,alpine-smp

0 → 100644
+52 −0
Original line number Diff line number Diff line 
========================================================

Secondary CPU enable-method "al,alpine-smp" binding

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



This document describes the "al,alpine-smp" method for

enabling secondary CPUs. To apply to all CPUs, a single

"al,alpine-smp" enable method should be defined in the

"cpus" node.



Enable method name:	"al,alpine-smp"

Compatible machines:	"al,alpine"

Compatible CPUs:	"arm,cortex-a15"

Related properties:	(none)



Note:

This enable method requires valid nodes compatible with

"al,alpine-cpu-resume" and "al,alpine-nb-service"[1].



Example:



cpus {

	#address-cells = <1>;

	#size-cells = <0>;

	enable-method = "al,alpine-smp";



	cpu@0 {

		compatible = "arm,cortex-a15";

		device_type = "cpu";

		reg = <0>;

	};



	cpu@1 {

		compatible = "arm,cortex-a15";

		device_type = "cpu";

		reg = <1>;

	};



	cpu@2 {

		compatible = "arm,cortex-a15";

		device_type = "cpu";

		reg = <2>;

	};



	cpu@3 {

		compatible = "arm,cortex-a15";

		device_type = "cpu";

		reg = <3>;

	};

};



--

[1] arm/al,alpine.txt