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

Commit a9a40a4a authored by Thierry Reding's avatar Thierry Reding
Browse files

soc/tegra: pmc: Add Tegra132 support 



Tegra132 uses the same GPU as Tegra124 and therefore requires the same
method to remove clamps. However Tegra132 has a separate chip ID, so in
order to avoid having to extend the list of chip IDs for the special
case, add a feature flag to the SoC data.

Reviewed-by: default avatarPaul Walmsley <pwalmsley@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 9b07eb05

drivers/soc/tegra/pmc.c

+10 −4
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ struct tegra_pmc_soc { 
	const char *const *powergates;

	unsigned int num_cpu_powergates;

	const u8 *cpu_powergates;



	bool has_gpu_clamps;

};



/**
@@ -225,11 +227,11 @@ int tegra_powergate_remove_clamping(int id) 
		return -EINVAL;



	/*

	 * The Tegra124 GPU has a separate register (with different semantics)

	 * to remove clamps.

	 * On Tegra124 and later, the clamps for the GPU are controlled by a

	 * separate register (with different semantics).

	 */

	if (tegra_get_chip_id() == TEGRA124) {

	if (id == TEGRA_POWERGATE_3D) {

		if (pmc->soc->has_gpu_clamps) {

			tegra_pmc_writel(0, GPU_RG_CNTRL);

			return 0;

		}
@@ -773,6 +775,7 @@ static const struct tegra_pmc_soc tegra20_pmc_soc = { 
	.powergates = tegra20_powergates,

	.num_cpu_powergates = 0,

	.cpu_powergates = NULL,

	.has_gpu_clamps = false,

};



static const char * const tegra30_powergates[] = {
@@ -804,6 +807,7 @@ static const struct tegra_pmc_soc tegra30_pmc_soc = { 
	.powergates = tegra30_powergates,

	.num_cpu_powergates = ARRAY_SIZE(tegra30_cpu_powergates),

	.cpu_powergates = tegra30_cpu_powergates,

	.has_gpu_clamps = false,

};



static const char * const tegra114_powergates[] = {
@@ -839,6 +843,7 @@ static const struct tegra_pmc_soc tegra114_pmc_soc = { 
	.powergates = tegra114_powergates,

	.num_cpu_powergates = ARRAY_SIZE(tegra114_cpu_powergates),

	.cpu_powergates = tegra114_cpu_powergates,

	.has_gpu_clamps = false,

};



static const char * const tegra124_powergates[] = {
@@ -880,6 +885,7 @@ static const struct tegra_pmc_soc tegra124_pmc_soc = { 
	.powergates = tegra124_powergates,

	.num_cpu_powergates = ARRAY_SIZE(tegra124_cpu_powergates),

	.cpu_powergates = tegra124_cpu_powergates,

	.has_gpu_clamps = true,

};



static const struct of_device_id tegra_pmc_match[] = {