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

Commit 7bf15412 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.11-soc' of... 

Merge tag 'tegra-for-3.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc

From Stephen Warren:
ARM: tegra: core SoC support enhancements

This branch contains fixes and enhancement for core Tegra Soc support:
* CPU hotplug support for Tegra114.
* Some preliminary work on Tegra114 CPU sleep modes.
* Minor fix for EMC table DT parsing.

* tag 'tegra-for-3.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra

:
  ARM: tegra: don't pass CPU ID to tegra_{set,clear}_cpu_in_lp2
  ARM: tegra: cpuidle: using IS_ENABLED for multi SoCs management in init func
  ARM: tegra: hook tegra_tear_down_cpu function in the PM suspend init function
  ARM: tegra: cpuidle: move the init function behind the suspend init function
  ARM: tegra: remove ifdef in the tegra_resume
  ARM: tegra: add cpu_disable for hotplug
  ARM: tegra114: add CPU hotplug support
  clk: tegra114: implement wait_for_reset and disable_clock for tegra_cpu_car_ops
  ARM: tegra114: add power up sequence for warm boot CPU
  ARM: tegra: make tegra_resume can work for Tegra114
  ARM: tegra: skip SCU and PL310 code when CPU is not Cortex-A9
  ARM: tegra: add an assembly marco to check Tegra SoC ID
  ARM: tegra: emc: correction of ram-code parsing from dt

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 677b5c48 8f6a0b65

arch/arm/mach-tegra/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o 
obj-$(CONFIG_TEGRA_PCI)			+= pcie.o



obj-$(CONFIG_ARCH_TEGRA_114_SOC)	+= tegra114_speedo.o

obj-$(CONFIG_ARCH_TEGRA_114_SOC)	+= sleep-tegra30.o

ifeq ($(CONFIG_CPU_IDLE),y)

obj-$(CONFIG_ARCH_TEGRA_114_SOC)	+= cpuidle-tegra114.o

endif

arch/arm/mach-tegra/common.c

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include "board.h"

#include "common.h"

#include "cpuidle.h"

#include "fuse.h"

#include "iomap.h"

#include "irq.h"
@@ -108,5 +109,6 @@ void __init tegra_init_early(void) 
void __init tegra_init_late(void)

{

	tegra_init_suspend();

	tegra_cpuidle_init();

	tegra_powergate_debugfs_init();

}

arch/arm/mach-tegra/common.h

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ extern struct smp_operations tegra_smp_ops; 


extern int tegra_cpu_kill(unsigned int cpu);

extern void tegra_cpu_die(unsigned int cpu);

extern int tegra_cpu_disable(unsigned int cpu);

arch/arm/mach-tegra/cpuidle-tegra20.c

+3 −7
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev, 
				    struct cpuidle_driver *drv,

				    int index)

{

	u32 cpu = is_smp() ? cpu_logical_map(dev->cpu) : dev->cpu;

	bool entered_lp2 = false;



	if (tegra_pending_sgi())
@@ -193,16 +192,16 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev, 


	local_fiq_disable();



	tegra_set_cpu_in_lp2(cpu);

	tegra_set_cpu_in_lp2();

	cpu_pm_enter();



	if (cpu == 0)

	if (dev->cpu == 0)

		entered_lp2 = tegra20_cpu_cluster_power_down(dev, drv, index);

	else

		entered_lp2 = tegra20_idle_enter_lp2_cpu_1(dev, drv, index);



	cpu_pm_exit();

	tegra_clear_cpu_in_lp2(cpu);

	tegra_clear_cpu_in_lp2();



	local_fiq_enable();
@@ -214,8 +213,5 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev, 


int __init tegra20_cpuidle_init(void)

{

#ifdef CONFIG_PM_SLEEP

	tegra_tear_down_cpu = tegra20_tear_down_cpu;

#endif

	return cpuidle_register(&tegra_idle_driver, cpu_possible_mask);

}

arch/arm/mach-tegra/cpuidle-tegra30.c

+3 −7
Original line number Diff line number Diff line
@@ -114,16 +114,15 @@ static int tegra30_idle_lp2(struct cpuidle_device *dev, 
			    struct cpuidle_driver *drv,

			    int index)

{

	u32 cpu = is_smp() ? cpu_logical_map(dev->cpu) : dev->cpu;

	bool entered_lp2 = false;

	bool last_cpu;



	local_fiq_disable();



	last_cpu = tegra_set_cpu_in_lp2(cpu);

	last_cpu = tegra_set_cpu_in_lp2();

	cpu_pm_enter();



	if (cpu == 0) {

	if (dev->cpu == 0) {

		if (last_cpu)

			entered_lp2 = tegra30_cpu_cluster_power_down(dev, drv,

								     index);
@@ -134,7 +133,7 @@ static int tegra30_idle_lp2(struct cpuidle_device *dev, 
	}



	cpu_pm_exit();

	tegra_clear_cpu_in_lp2(cpu);

	tegra_clear_cpu_in_lp2();



	local_fiq_enable();
@@ -146,8 +145,5 @@ static int tegra30_idle_lp2(struct cpuidle_device *dev, 


int __init tegra30_cpuidle_init(void)

{

#ifdef CONFIG_PM_SLEEP

	tegra_tear_down_cpu = tegra30_tear_down_cpu;

#endif

	return cpuidle_register(&tegra_idle_driver, NULL);

}