diff --git a/[refs] b/[refs] index 6193511e963f..0955b1c9c06b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ac8cb5c213a3f3cfc243ef2f635794bd4b55c60 +refs/heads/master: 6cafa97d3ca6a480dc39e20bb2d12ec2c5ca025e diff --git a/trunk/arch/arm/mach-tegra/include/mach/powergate.h b/trunk/arch/arm/mach-tegra/include/mach/powergate.h index 0ec8ce1cbd22..ca41186a545f 100644 --- a/trunk/arch/arm/mach-tegra/include/mach/powergate.h +++ b/trunk/arch/arm/mach-tegra/include/mach/powergate.h @@ -27,6 +27,16 @@ #define TEGRA_POWERGATE_VDEC 4 #define TEGRA_POWERGATE_L2 5 #define TEGRA_POWERGATE_MPE 6 +#define TEGRA_POWERGATE_HEG 7 +#define TEGRA_POWERGATE_SATA 8 +#define TEGRA_POWERGATE_CPU1 9 +#define TEGRA_POWERGATE_CPU2 10 +#define TEGRA_POWERGATE_CPU3 11 +#define TEGRA_POWERGATE_CELP 12 +#define TEGRA_POWERGATE_3D1 13 + +#define TEGRA_POWERGATE_CPU0 TEGRA_POWERGATE_CPU +#define TEGRA_POWERGATE_3D0 TEGRA_POWERGATE_3D int tegra_powergate_is_powered(int id); int tegra_powergate_power_on(int id); diff --git a/trunk/arch/arm/mach-tegra/powergate.c b/trunk/arch/arm/mach-tegra/powergate.c index 984bbdfec5db..7120ad7e1355 100644 --- a/trunk/arch/arm/mach-tegra/powergate.c +++ b/trunk/arch/arm/mach-tegra/powergate.c @@ -167,6 +167,9 @@ int __init tegra_powergate_init(void) case TEGRA20: tegra_num_powerdomains = 7; break; + case TEGRA30: + tegra_num_powerdomains = 14; + break; default: /* Unknown Tegra variant. Disable powergating */ tegra_num_powerdomains = 0;