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

Commit cb1110ca authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'highbank-for-3.13' of... 

Merge tag 'highbank-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into next/soc

From Rob Herring:
Highbank platform updates for 3.13

- convert Calxeda cpuidle driver to a platform driver and to use PSCI
- convert highbank smp_ops and suspend to PSCI

* tag 'highbank-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dts: calxeda: add ARM PSCI binding
  ARM: highbank: adapt to use ARM PSCI calls
  ARM: PSCI: remove unnecessary include of arm-gic.h
  cpuidle: calxeda: add support to use PSCI calls
  ARM: highbank: cpuidle: convert to platform driver
  cpuidle: calxeda: add cpu_pm_enter/exit calls
parents 0d481d41 78bbca1a

arch/arm/boot/dts/ecx-common.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -19,6 +19,14 @@ 
		bootargs = "console=ttyAMA0";

	};



	psci {

		compatible	= "arm,psci";

		method		= "smc";

		cpu_suspend	= <0x84000002>;

		cpu_off		= <0x84000004>;

		cpu_on		= <0x84000006>;

	};



	soc {

		#address-cells = <1>;

		#size-cells = <1>;

arch/arm/kernel/psci_smp.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 */



#include <linux/init.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/smp.h>

#include <linux/of.h>

arch/arm/mach-highbank/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ config ARCH_HIGHBANK 
	select ARM_ERRATA_775420

	select ARM_ERRATA_798181

	select ARM_GIC

	select ARM_PSCI

	select ARM_TIMER_SP804

	select CACHE_L2X0

	select CLKDEV_LOOKUP

arch/arm/mach-highbank/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -3,6 +3,4 @@ obj-y := highbank.o system.o smc.o 
plus_sec := $(call as-instr,.arch_extension sec,+sec)

AFLAGS_smc.o				:=-Wa,-march=armv7-a$(plus_sec)



obj-$(CONFIG_SMP)			+= platsmp.o

obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o

obj-$(CONFIG_PM_SLEEP)			+= pm.o

arch/arm/mach-highbank/core.h

+0 −4
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include <linux/reboot.h>



extern void highbank_set_cpu_jump(int cpu, void *jump_addr);

extern void highbank_restart(enum reboot_mode, const char *);

extern void __iomem *scu_base_addr;
@@ -14,8 +13,5 @@ static inline void highbank_pm_init(void) {} 
#endif



extern void highbank_smc1(int fn, int arg);

extern void highbank_cpu_die(unsigned int cpu);



extern struct smp_operations highbank_smp_ops;



#endif