Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755833AbaLWKkN (ORCPT ); Tue, 23 Dec 2014 05:40:13 -0500 Received: from hqemgate16.nvidia.com ([216.228.121.65]:12463 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755791AbaLWKkK (ORCPT ); Tue, 23 Dec 2014 05:40:10 -0500 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Tue, 23 Dec 2014 02:34:59 -0800 From: Vince Hsu To: thierry.reding@gmail.com, swarren@wwwdotorg.org, gnurou@gmail.com, bskeggs@redhat.com, martin.peres@free.fr, seven@nimrod-online.com, samuel.pitoiset@gmail.com CC: nouveau@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, Vince Hsu Subject: [PATCH 1/11] ARM: tegra: add function to control the GPU rail clamp Date: Tue, 23 Dec 2014 18:39:54 +0800 Message-ID: <1419331204-26679-2-git-send-email-vinceh@nvidia.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1419331204-26679-1-git-send-email-vinceh@nvidia.com> References: <1419331204-26679-1-git-send-email-vinceh@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Tegra124 and later Tegra SoCs have a sepatate rail gating register to enable/disable the clamp. The original function tegra_powergate_remove_clamping() is not sufficient for the enable function. So add a new function which is dedicated to the GPU rail gating. Also don't refer to the powergate ID since the GPU ID makes no sense here. Signed-off-by: Vince Hsu --- drivers/soc/tegra/pmc.c | 34 +++++++++++++++++++++++----------- include/soc/tegra/pmc.h | 2 ++ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index a2c0ceb95f8f..7798c530ead1 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -225,17 +225,6 @@ int tegra_powergate_remove_clamping(int id) return -EINVAL; /* - * The Tegra124 GPU has a separate register (with different semantics) - * to remove clamps. - */ - if (tegra_get_chip_id() == TEGRA124) { - if (id == TEGRA_POWERGATE_3D) { - tegra_pmc_writel(0, GPU_RG_CNTRL); - return 0; - } - } - - /* * Tegra 2 has a bug where PCIE and VDE clamping masks are * swapped relatively to the partition ids */ @@ -253,6 +242,29 @@ int tegra_powergate_remove_clamping(int id) EXPORT_SYMBOL(tegra_powergate_remove_clamping); /** + * tegra_powergate_gpu_set_clamping - control GPU-SOC clamps + * + * The post-Tegra114 chips have a separate rail gating register to configure + * clamps. + * + * @assert: true to assert clamp, and false to remove + */ +int tegra_powergate_gpu_set_clamping(bool assert) +{ + if (!pmc->soc) + return -EINVAL; + + if (tegra_get_chip_id() == TEGRA124) { + tegra_pmc_writel(assert ? 1 : 0, GPU_RG_CNTRL); + tegra_pmc_readl(GPU_RG_CNTRL); + return 0; + } + + return -EINVAL; +} +EXPORT_SYMBOL(tegra_powergate_gpu_set_clamping); + +/** * tegra_powergate_sequence_power_up() - power up partition * @id: partition ID * @clk: clock for partition diff --git a/include/soc/tegra/pmc.h b/include/soc/tegra/pmc.h index 65a93273e72f..53d620525a9e 100644 --- a/include/soc/tegra/pmc.h +++ b/include/soc/tegra/pmc.h @@ -109,6 +109,8 @@ int tegra_powergate_is_powered(int id); int tegra_powergate_power_on(int id); int tegra_powergate_power_off(int id); int tegra_powergate_remove_clamping(int id); +/* Only for Tegra124 and later */ +int tegra_powergate_gpu_set_clamping(bool assert); /* Must be called with clk disabled, and returns with clk enabled */ int tegra_powergate_sequence_power_up(int id, struct clk *clk, -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/