Commit 7741868f authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding
Browse files

ARM: tegra: Expose PM functions required for new cpuidle driver 



The upcoming unified CPUIDLE driver will be added to the drivers/cpuidle/
directory and it will require all these exposed Tegra PM-core functions.

Acked-by: default avatarPeter De Schrijver <pdeschrijver@nvidia.com>
Tested-by: default avatarPeter Geis <pgwipeout@gmail.com>
Tested-by: default avatarJasper Korten <jja2000@gmail.com>
Tested-by: default avatarDavid Heidelberg <david@ixit.cz>
Tested-by: default avatarNicolas Chauvet <kwizart@gmail.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
[treding@nvidia.com: fixup missing include rename]
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 891e1286

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

+2 −1
Original line number Diff line number Diff line
@@ -12,13 +12,14 @@ 


#include <linux/firmware/trusted_foundations.h>



#include <soc/tegra/pm.h>



#include <asm/cpuidle.h>

#include <asm/smp_plat.h>

#include <asm/suspend.h>

#include <asm/psci.h>



#include "cpuidle.h"

#include "pm.h"

#include "sleep.h"



#ifdef CONFIG_PM_SLEEP

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

+2 −2
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include <linux/module.h>



#include <soc/tegra/flowctrl.h>

#include <soc/tegra/irq.h>

#include <soc/tegra/pm.h>



#include <asm/cpuidle.h>

#include <asm/smp_plat.h>
@@ -25,8 +27,6 @@ 


#include "cpuidle.h"

#include "iomap.h"

#include "irq.h"

#include "pm.h"

#include "reset.h"

#include "sleep.h"

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

+2 −1
Original line number Diff line number Diff line
@@ -17,12 +17,13 @@ 
#include <linux/kernel.h>

#include <linux/module.h>



#include <soc/tegra/pm.h>



#include <asm/cpuidle.h>

#include <asm/smp_plat.h>

#include <asm/suspend.h>



#include "cpuidle.h"

#include "pm.h"

#include "sleep.h"



#ifdef CONFIG_PM_SLEEP

arch/arm/mach-tegra/irq.c

+2 −1
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ 
#include <linux/of.h>

#include <linux/syscore_ops.h>



#include <soc/tegra/irq.h>



#include "board.h"

#include "iomap.h"

#include "irq.h"



#define SGI_MASK 0xFFFF

arch/arm/mach-tegra/pm.h

+0 −8
Original line number Diff line number Diff line
@@ -23,20 +23,12 @@ void tegra20_sleep_core_init(void); 
void tegra30_lp1_iram_hook(void);

void tegra30_sleep_core_init(void);



void tegra_clear_cpu_in_lp2(void);

void tegra_set_cpu_in_lp2(void);

int tegra_idle_lp2_last(void);

extern void (*tegra_tear_down_cpu)(void);



#ifdef CONFIG_PM_SLEEP

void tegra_init_suspend(void);

int tegra_pm_park_secondary_cpu(unsigned long cpu);

#else

static inline void tegra_init_suspend(void) {}

static inline int tegra_pm_park_secondary_cpu(unsigned long cpu)

{

	return -ENOTSUPP;

}

#endif



#endif /* _MACH_TEGRA_PM_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE