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

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

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

Merge "ARM: tegra: core code changes for 3.17" from Thierry Reding:

Some of the code that's currently called from the Tegra machine setup
code is moved to regular initcalls. To catch dependency violations, the
various code paths now WARN if they're called to early. Not all of the
potential candidates are converted yet, but those that were have been
verified to work across all supported Tegra generations.

A new function, soc_is_tegra(), is also provided to make sure that the
initcalls can abort early if they aren't run on Tegra, which can happen
for multi-platform builds.

Finally this also moves out the PMC driver to drivers/soc/tegra so that
it can be shared with 64-bit ARM.

This is based on the for-3.17/fuse-move branch. The split is somewhat
arbitrary but allows the dependents of the for-3.17/fuse-move to pull
in as little code as necessary.

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

:
  ARM: tegra: Convert PMC to a driver
  soc/tegra: fuse: Set up in early initcall
  ARM: tegra: Always lock the CPU reset vector
  ARM: tegra: Setup CPU hotplug in a pure initcall
  soc/tegra: Implement runtime check for Tegra SoCs

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 23e89292 7232398a

arch/arm/mach-tegra/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -2,9 +2,7 @@ asflags-y += -march=armv7-a 


obj-y                                   += io.o

obj-y                                   += irq.o

obj-y					+= pmc.o

obj-y					+= flowctrl.o

obj-y					+= powergate.o

obj-y					+= pm.o

obj-y					+= reset.o

obj-y					+= reset-handler.o

arch/arm/mach-tegra/board.h

+0 −7
Original line number Diff line number Diff line
@@ -28,13 +28,6 @@ 
void __init tegra_map_common_io(void);

void __init tegra_init_irq(void);



int __init tegra_powergate_init(void);

#if defined(CONFIG_ARCH_TEGRA_2x_SOC) && defined(CONFIG_DEBUG_FS)

int __init tegra_powergate_debugfs_init(void);

#else

static inline int tegra_powergate_debugfs_init(void) { return 0; }

#endif



void __init tegra_paz00_wifikill_init(void);



#endif

arch/arm/mach-tegra/hotplug.c

+14 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/kernel.h>

#include <linux/smp.h>



#include <soc/tegra/common.h>

#include <soc/tegra/fuse.h>



#include <asm/smp_plat.h>
@@ -38,6 +39,11 @@ int tegra_cpu_kill(unsigned cpu) 
 */

void __ref tegra_cpu_die(unsigned int cpu)

{

	if (!tegra_hotplug_shutdown) {

		WARN(1, "hotplug is not yet initialized\n");

		return;

	}



	/* Clean L1 data cache */

	tegra_disable_clean_inv_dcache(TEGRA_FLUSH_CACHE_LOUIS);
@@ -48,10 +54,13 @@ void __ref tegra_cpu_die(unsigned int cpu) 
	BUG();

}



void __init tegra_hotplug_init(void)

static int __init tegra_hotplug_init(void)

{

	if (!IS_ENABLED(CONFIG_HOTPLUG_CPU))

		return;

		return 0;



	if (!soc_is_tegra())

		return 0;



	if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && tegra_get_chip_id() == TEGRA20)

		tegra_hotplug_shutdown = tegra20_hotplug_shutdown;
@@ -61,4 +70,7 @@ void __init tegra_hotplug_init(void) 
		tegra_hotplug_shutdown = tegra30_hotplug_shutdown;

	if (IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC) && tegra_get_chip_id() == TEGRA124)

		tegra_hotplug_shutdown = tegra30_hotplug_shutdown;



	return 0;

}

pure_initcall(tegra_hotplug_init);

arch/arm/mach-tegra/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/smp.h>



#include <soc/tegra/fuse.h>

#include <soc/tegra/pmc.h>



#include <asm/cacheflush.h>

#include <asm/mach-types.h>
@@ -31,7 +32,6 @@ 
#include "common.h"

#include "flowctrl.h"

#include "iomap.h"

#include "pmc.h"

#include "reset.h"



static cpumask_t tegra_cpu_init_mask;

arch/arm/mach-tegra/pm.c

+24 −8
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <linux/suspend.h>



#include <soc/tegra/fuse.h>

#include <soc/tegra/pm.h>

#include <soc/tegra/pmc.h>



#include <asm/cacheflush.h>

#include <asm/idmap.h>
@@ -38,7 +40,6 @@ 


#include "flowctrl.h"

#include "iomap.h"

#include "pmc.h"

#include "pm.h"

#include "reset.h"

#include "sleep.h"
@@ -167,9 +168,29 @@ static int tegra_sleep_cpu(unsigned long v2p) 
	return 0;

}



static void tegra_pm_set(enum tegra_suspend_mode mode)

{

	u32 value;



	switch (tegra_get_chip_id()) {

	case TEGRA20:

	case TEGRA30:

		break;

	default:

		/* Turn off CRAIL */

		value = flowctrl_read_cpu_csr(0);

		value &= ~FLOW_CTRL_CSR_ENABLE_EXT_MASK;

		value |= FLOW_CTRL_CSR_ENABLE_EXT_CRAIL;

		flowctrl_write_cpu_csr(0, value);

		break;

	}



	tegra_pmc_enter_suspend_mode(mode);

}



void tegra_idle_lp2_last(void)

{

	tegra_pmc_pm_set(TEGRA_SUSPEND_LP2);

	tegra_pm_set(TEGRA_SUSPEND_LP2);



	cpu_cluster_pm_enter();

	suspend_cpu_complex();
@@ -268,8 +289,6 @@ static bool tegra_sleep_core_init(void) 


static void tegra_suspend_enter_lp1(void)

{

	tegra_pmc_suspend();



	/* copy the reset vector & SDRAM shutdown code into IRAM */

	memcpy(iram_save_addr, IO_ADDRESS(TEGRA_IRAM_LPx_RESUME_AREA),

		iram_save_size);
@@ -281,8 +300,6 @@ static void tegra_suspend_enter_lp1(void) 


static void tegra_suspend_exit_lp1(void)

{

	tegra_pmc_resume();



	/* restore IRAM */

	memcpy(IO_ADDRESS(TEGRA_IRAM_LPx_RESUME_AREA), iram_save_addr,

		iram_save_size);
@@ -307,7 +324,7 @@ static int tegra_suspend_enter(suspend_state_t state) 


	pr_info("Entering suspend state %s\n", lp_state[mode]);



	tegra_pmc_pm_set(mode);

	tegra_pm_set(mode);



	local_fiq_disable();
@@ -355,7 +372,6 @@ void __init tegra_init_suspend(void) 
		return;



	tegra_tear_down_cpu_init();

	tegra_pmc_suspend_init();



	if (mode >= TEGRA_SUSPEND_LP1) {

		if (!tegra_lp1_iram_hook() || !tegra_sleep_core_init()) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE