Commit aaf75e45 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'cpuidle/biglittle' into next/drivers 



From Lorenzo Pieralisi:
This patch series contains:

- GIC driver update to add a method to disable the GIC CPU IF
- TC2 MCPM update to add GIC CPU disabling to suspend method
- TC2 CPU idle big.LITTLE driver

* cpuidle/biglittle:
  cpuidle: big.LITTLE: vexpress-TC2 CPU idle driver
  ARM: vexpress: tc2: disable GIC CPU IF in tc2_pm_suspend
  drivers: irq-chip: irq-gic: introduce gic_cpu_if_down()
  ARM: vexpress/TC2: implement PM suspend method
  ARM: vexpress/TC2: basic PM support
  ARM: vexpress: Add SCC to V2P-CA15_A7's device tree
  ARM: vexpress/TC2: add Serial Power Controller (SPC) support
  ARM: vexpress/dcscb: fix cache disabling sequences

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b36f4be3 14d2c34c

Documentation/devicetree/bindings/arm/vexpress-scc.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
ARM Versatile Express Serial Configuration Controller

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



Test chips for ARM Versatile Express platform implement SCC (Serial

Configuration Controller) interface, used to set initial conditions

for the test chip.



In some cases its registers are also mapped in normal address space

and can be used to obtain runtime information about the chip internals

(like silicon temperature sensors) and as interface to other subsystems

like platform configuration control and power management.



Required properties:



- compatible value: "arm,vexpress-scc,<model>", "arm,vexpress-scc";

		    where <model> is the full tile model name (as used

		    in the tile's Technical Reference Manual),

		    eg. for Coretile Express A15x2 A7x3 (V2P-CA15_A7):

	compatible = "arm,vexpress-scc,v2p-ca15_a7", "arm,vexpress-scc";



Optional properties:



- reg: when the SCC is memory mapped, physical address and size of the

       registers window

- interrupts: when the SCC can generate a system-level interrupt



Example:



	scc@7fff0000 {

		compatible = "arm,vexpress-scc,v2p-ca15_a7", "arm,vexpress-scc";

		reg = <0 0x7fff0000 0 0x1000>;

		interrupts = <0 95 4>;

	};

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -2268,6 +2268,15 @@ F: drivers/cpufreq/arm_big_little.h 
F:	drivers/cpufreq/arm_big_little.c

F:	drivers/cpufreq/arm_big_little_dt.c



CPUIDLE DRIVER - ARM BIG LITTLE

M:      Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

M:      Daniel Lezcano <daniel.lezcano@linaro.org>

L:      linux-pm@vger.kernel.org

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

T:      git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

S:      Maintained

F:      drivers/cpuidle/cpuidle-big_little.c



CPUIDLE DRIVERS

M:	Rafael J. Wysocki <rjw@sisk.pl>

M:	Daniel Lezcano <daniel.lezcano@linaro.org>

arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts

+6 −0
Original line number Diff line number Diff line
@@ -125,6 +125,12 @@ 
		clock-names = "apb_pclk";

	};



        scc@7fff0000 {

		compatible = "arm,vexpress-scc,v2p-ca15_a7", "arm,vexpress-scc";

		reg = <0 0x7fff0000 0 0x1000>;

		interrupts = <0 95 4>;

        };



	timer {

		compatible = "arm,armv7-timer";

		interrupts = <1 13 0xf08>,

arch/arm/mach-vexpress/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -66,4 +66,12 @@ config ARCH_VEXPRESS_DCSCB 
	  This is needed to provide CPU and cluster power management

	  on RTSM implementing big.LITTLE.



config ARCH_VEXPRESS_TC2_PM

	bool "Versatile Express TC2 power management"

	depends on MCPM

	select ARM_CCI

	help

	  Support for CPU and cluster power management on Versatile Express

	  with a TC2 (A15x2 A7x3) big.LITTLE core tile.



endmenu

arch/arm/mach-vexpress/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,5 +7,6 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ 
obj-y					:= v2m.o

obj-$(CONFIG_ARCH_VEXPRESS_CA9X4)	+= ct-ca9x4.o

obj-$(CONFIG_ARCH_VEXPRESS_DCSCB)	+= dcscb.o	dcscb_setup.o

obj-$(CONFIG_ARCH_VEXPRESS_TC2_PM)	+= tc2_pm.o spc.o

obj-$(CONFIG_SMP)			+= platsmp.o

obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE