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

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

Merge tag 'tegra-for-3.7-fixes' of... 

Merge tag 'tegra-for-3.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/fixes-non-critical

* tag 'tegra-for-3.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: enable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA
  ARM: tegra: fix debugfs entry for Tegra30
  ARM: tegra: fix return value for debugfs init
parents ca43af52 4b1082ca

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2313,7 +2313,7 @@ menu "Power management options" 
source "kernel/power/Kconfig"



config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5PC100 && !ARCH_TEGRA

	depends on !ARCH_S5PC100

	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK

	def_bool y

arch/arm/mach-tegra/powergate.c

+36 −7
Original line number Diff line number Diff line
@@ -199,7 +199,9 @@ int __init tegra_powergate_init(void) 


#ifdef CONFIG_DEBUG_FS



static const char * const powergate_name[] = {

static const char * const *powergate_name;



static const char * const powergate_name_t20[] = {

	[TEGRA_POWERGATE_CPU]	= "cpu",

	[TEGRA_POWERGATE_3D]	= "3d",

	[TEGRA_POWERGATE_VENC]	= "venc",
@@ -209,6 +211,23 @@ static const char * const powergate_name[] = { 
	[TEGRA_POWERGATE_MPE]	= "mpe",

};



static const char * const powergate_name_t30[] = {

	[TEGRA_POWERGATE_CPU]	= "cpu0",

	[TEGRA_POWERGATE_3D]	= "3d0",

	[TEGRA_POWERGATE_VENC]	= "venc",

	[TEGRA_POWERGATE_VDEC]	= "vdec",

	[TEGRA_POWERGATE_PCIE]	= "pcie",

	[TEGRA_POWERGATE_L2]	= "l2",

	[TEGRA_POWERGATE_MPE]	= "mpe",

	[TEGRA_POWERGATE_HEG]	= "heg",

	[TEGRA_POWERGATE_SATA]	= "sata",

	[TEGRA_POWERGATE_CPU1]	= "cpu1",

	[TEGRA_POWERGATE_CPU2]	= "cpu2",

	[TEGRA_POWERGATE_CPU3]	= "cpu3",

	[TEGRA_POWERGATE_CELP]	= "celp",

	[TEGRA_POWERGATE_3D1]	= "3d1",

};



static int powergate_show(struct seq_file *s, void *data)

{

	int i;
@@ -237,14 +256,24 @@ static const struct file_operations powergate_fops = { 
int __init tegra_powergate_debugfs_init(void)

{

	struct dentry *d;

	int err = -ENOMEM;



	switch (tegra_chip_id) {

	case TEGRA20:

		powergate_name = powergate_name_t20;

		break;

	case TEGRA30:

		powergate_name = powergate_name_t30;

		break;

	}



	if (powergate_name) {

		d = debugfs_create_file("powergate", S_IRUGO, NULL, NULL,

			&powergate_fops);

		if (!d)

			return -ENOMEM;

	}



	return err;

	return 0;

}



#endif