From: Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> To: "Stephen Warren" <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>, "Thierry Reding" <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, "Alexandre Courbot" <gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, "Philipp Zabel" <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>, "Peter De Schrijver" <pdeschrijver-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>, "Prashant Gaikwad" <pgaikwad-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>, "Terje Bergström" <tbergstrom-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>, "Hans de Goede" <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, "Tejun Heo" <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Cc: Vince Hsu <vinceh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>, "Rafael J. Wysocki" <rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org>, Kevin Hilman <khilman-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> Subject: [PATCH V3 16/19] soc: tegra: pmc: Remove the deprecated powergate APIs Date: Mon, 13 Jul 2015 13:39:54 +0100 [thread overview] Message-ID: <1436791197-32358-17-git-send-email-jonathanh@nvidia.com> (raw) In-Reply-To: <1436791197-32358-1-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> Drivers using the deprecated tegra powergate APIs have been updated and so now we can remove these unused deprecated APIs. Signed-off-by: Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> --- drivers/soc/tegra/pmc.c | 68 ------------------------------------------------- include/soc/tegra/pmc.h | 22 ---------------- 2 files changed, 90 deletions(-) diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index 4de92a9dae65..402f13727e75 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -484,31 +484,6 @@ static int tegra_genpd_power_off(struct generic_pm_domain *domain) } /** - * tegra_powergate_power_on() - power on partition - * @id: partition ID - */ -int tegra_powergate_power_on(int id) -{ - if (!pmc->soc || id < 0 || id >= pmc->soc->num_powergates) - return -EINVAL; - - return tegra_powergate_set(id, true, true); -} - -/** - * tegra_powergate_power_off() - power off partition - * @id: partition ID - */ -int tegra_powergate_power_off(int id) -{ - if (!pmc->soc || id < 0 || id >= pmc->soc->num_powergates) - return -EINVAL; - - return tegra_powergate_set(id, false, true); -} -EXPORT_SYMBOL(tegra_powergate_power_off); - -/** * tegra_powergate_is_powered() - check if partition is powered * @id: partition ID */ @@ -566,49 +541,6 @@ int tegra_powergate_remove_clamping(int id) } EXPORT_SYMBOL(tegra_powergate_remove_clamping); -/** - * tegra_powergate_sequence_power_up() - power up partition - * @id: partition ID - * @clk: clock for partition - * @rst: reset for partition - * - * Must be called with clk disabled, and returns with clk enabled. - */ -int tegra_powergate_sequence_power_up(int id, struct clk *clk, - struct reset_control *rst) -{ - int ret; - - reset_control_assert(rst); - - ret = tegra_powergate_power_on(id); - if (ret) - goto err_power; - - ret = clk_prepare_enable(clk); - if (ret) - goto err_clk; - - usleep_range(10, 20); - - ret = tegra_powergate_remove_clamping(id); - if (ret) - goto err_clamp; - - usleep_range(10, 20); - reset_control_deassert(rst); - - return 0; - -err_clamp: - clk_disable_unprepare(clk); -err_clk: - tegra_powergate_power_off(id); -err_power: - return ret; -} -EXPORT_SYMBOL(tegra_powergate_sequence_power_up); - int tegra_powergate_power_on_legacy(int id, struct clk *clk, struct reset_control *rst) { diff --git a/include/soc/tegra/pmc.h b/include/soc/tegra/pmc.h index 67b75d82edc7..509c1a3ca879 100644 --- a/include/soc/tegra/pmc.h +++ b/include/soc/tegra/pmc.h @@ -79,14 +79,8 @@ int tegra_pmc_cpu_remove_clamping(int cpuid); #ifdef CONFIG_ARCH_TEGRA 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); -/* Must be called with clk disabled, and returns with clk enabled */ -int tegra_powergate_sequence_power_up(int id, struct clk *clk, - struct reset_control *rst); - int tegra_powergate_power_on_legacy(int id, struct clk *clk, struct reset_control *rst); @@ -101,27 +95,11 @@ static inline int tegra_powergate_is_powered(int id) return -ENOSYS; } -static inline int tegra_powergate_power_on(int id) -{ - return -ENOSYS; -} - -static inline int tegra_powergate_power_off(int id) -{ - return -ENOSYS; -} - static inline int tegra_powergate_remove_clamping(int id) { return -ENOSYS; } -static inline int tegra_powergate_sequence_power_up(int id, struct clk *clk, - struct reset_control *rst) -{ - return -ENOSYS; -} - static inline int tegra_io_rail_power_on(int id) { return -ENOSYS; -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: jonathanh@nvidia.com (Jon Hunter) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V3 16/19] soc: tegra: pmc: Remove the deprecated powergate APIs Date: Mon, 13 Jul 2015 13:39:54 +0100 [thread overview] Message-ID: <1436791197-32358-17-git-send-email-jonathanh@nvidia.com> (raw) In-Reply-To: <1436791197-32358-1-git-send-email-jonathanh@nvidia.com> Drivers using the deprecated tegra powergate APIs have been updated and so now we can remove these unused deprecated APIs. Signed-off-by: Jon Hunter <jonathanh@nvidia.com> --- drivers/soc/tegra/pmc.c | 68 ------------------------------------------------- include/soc/tegra/pmc.h | 22 ---------------- 2 files changed, 90 deletions(-) diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index 4de92a9dae65..402f13727e75 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -484,31 +484,6 @@ static int tegra_genpd_power_off(struct generic_pm_domain *domain) } /** - * tegra_powergate_power_on() - power on partition - * @id: partition ID - */ -int tegra_powergate_power_on(int id) -{ - if (!pmc->soc || id < 0 || id >= pmc->soc->num_powergates) - return -EINVAL; - - return tegra_powergate_set(id, true, true); -} - -/** - * tegra_powergate_power_off() - power off partition - * @id: partition ID - */ -int tegra_powergate_power_off(int id) -{ - if (!pmc->soc || id < 0 || id >= pmc->soc->num_powergates) - return -EINVAL; - - return tegra_powergate_set(id, false, true); -} -EXPORT_SYMBOL(tegra_powergate_power_off); - -/** * tegra_powergate_is_powered() - check if partition is powered * @id: partition ID */ @@ -566,49 +541,6 @@ int tegra_powergate_remove_clamping(int id) } EXPORT_SYMBOL(tegra_powergate_remove_clamping); -/** - * tegra_powergate_sequence_power_up() - power up partition - * @id: partition ID - * @clk: clock for partition - * @rst: reset for partition - * - * Must be called with clk disabled, and returns with clk enabled. - */ -int tegra_powergate_sequence_power_up(int id, struct clk *clk, - struct reset_control *rst) -{ - int ret; - - reset_control_assert(rst); - - ret = tegra_powergate_power_on(id); - if (ret) - goto err_power; - - ret = clk_prepare_enable(clk); - if (ret) - goto err_clk; - - usleep_range(10, 20); - - ret = tegra_powergate_remove_clamping(id); - if (ret) - goto err_clamp; - - usleep_range(10, 20); - reset_control_deassert(rst); - - return 0; - -err_clamp: - clk_disable_unprepare(clk); -err_clk: - tegra_powergate_power_off(id); -err_power: - return ret; -} -EXPORT_SYMBOL(tegra_powergate_sequence_power_up); - int tegra_powergate_power_on_legacy(int id, struct clk *clk, struct reset_control *rst) { diff --git a/include/soc/tegra/pmc.h b/include/soc/tegra/pmc.h index 67b75d82edc7..509c1a3ca879 100644 --- a/include/soc/tegra/pmc.h +++ b/include/soc/tegra/pmc.h @@ -79,14 +79,8 @@ int tegra_pmc_cpu_remove_clamping(int cpuid); #ifdef CONFIG_ARCH_TEGRA 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); -/* Must be called with clk disabled, and returns with clk enabled */ -int tegra_powergate_sequence_power_up(int id, struct clk *clk, - struct reset_control *rst); - int tegra_powergate_power_on_legacy(int id, struct clk *clk, struct reset_control *rst); @@ -101,27 +95,11 @@ static inline int tegra_powergate_is_powered(int id) return -ENOSYS; } -static inline int tegra_powergate_power_on(int id) -{ - return -ENOSYS; -} - -static inline int tegra_powergate_power_off(int id) -{ - return -ENOSYS; -} - static inline int tegra_powergate_remove_clamping(int id) { return -ENOSYS; } -static inline int tegra_powergate_sequence_power_up(int id, struct clk *clk, - struct reset_control *rst) -{ - return -ENOSYS; -} - static inline int tegra_io_rail_power_on(int id) { return -ENOSYS; -- 2.1.4
next prev parent reply other threads:[~2015-07-13 12:39 UTC|newest] Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-07-13 12:39 [PATCH V3 00/19] Add generic PM domain support for Tegra SoCs Jon Hunter 2015-07-13 12:39 ` Jon Hunter 2015-07-13 12:39 ` [PATCH V3 06/19] clk: tegra: remove TEGRA_PLL_USE_LOCK for PLLD/PLLD2 Jon Hunter 2015-07-13 12:39 ` Jon Hunter [not found] ` <1436791197-32358-7-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-13 13:41 ` Peter De Schrijver 2015-07-13 13:41 ` Peter De Schrijver 2015-07-13 14:02 ` Jon Hunter 2015-07-13 14:02 ` Jon Hunter [not found] ` <55A3C50E.7060706-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-14 11:59 ` Jon Hunter 2015-07-14 11:59 ` Jon Hunter 2015-07-14 11:59 ` Jon Hunter [not found] ` <55A4F985.7010503-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-15 8:16 ` Peter De Schrijver 2015-07-15 8:16 ` Peter De Schrijver [not found] ` <1436791197-32358-1-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-13 12:39 ` [PATCH V3 01/19] reset: add of_reset_control_get_by_index() Jon Hunter 2015-07-13 12:39 ` Jon Hunter [not found] ` <1436791197-32358-2-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-17 12:08 ` Philipp Zabel 2015-07-17 12:08 ` Philipp Zabel 2015-07-13 12:39 ` [PATCH V3 02/19] memory: tegra: Add MC flush support Jon Hunter 2015-07-13 12:39 ` Jon Hunter 2015-07-17 9:57 ` Thierry Reding 2015-07-17 9:57 ` Thierry Reding 2015-07-17 10:20 ` Peter De Schrijver 2015-07-17 10:20 ` Peter De Schrijver [not found] ` <20150717102049.GQ6287-Rysk9IDjsxmJz7etNGeUX8VPkgjIgRvpAL8bYrjMMd8@public.gmane.org> 2015-07-17 11:31 ` Thierry Reding 2015-07-17 11:31 ` Thierry Reding 2015-07-20 8:46 ` Jon Hunter 2015-07-20 8:46 ` Jon Hunter 2015-07-20 9:17 ` Thierry Reding 2015-07-20 9:17 ` Thierry Reding 2015-07-20 9:59 ` Peter De Schrijver 2015-07-20 9:59 ` Peter De Schrijver [not found] ` <20150720095941.GZ6287-Rysk9IDjsxmJz7etNGeUX8VPkgjIgRvpAL8bYrjMMd8@public.gmane.org> 2015-07-20 13:14 ` Thierry Reding 2015-07-20 13:14 ` Thierry Reding 2015-07-21 10:57 ` Peter De Schrijver 2015-07-21 10:57 ` Peter De Schrijver 2015-07-13 12:39 ` [PATCH V3 03/19] memory: tegra: add flush operation for Tegra30 memory clients Jon Hunter 2015-07-13 12:39 ` Jon Hunter [not found] ` <1436791197-32358-4-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-17 10:03 ` Thierry Reding 2015-07-17 10:03 ` Thierry Reding 2015-07-21 8:54 ` Jon Hunter 2015-07-21 8:54 ` Jon Hunter 2015-07-13 12:39 ` [PATCH V3 04/19] memory: tegra: add flush operation for Tegra114 " Jon Hunter 2015-07-13 12:39 ` Jon Hunter [not found] ` <1436791197-32358-5-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-17 10:05 ` Thierry Reding 2015-07-17 10:05 ` Thierry Reding 2015-07-13 12:39 ` [PATCH V3 05/19] memory: tegra: add flush operation for Tegra124 " Jon Hunter 2015-07-13 12:39 ` Jon Hunter 2015-07-17 10:05 ` Thierry Reding 2015-07-17 10:05 ` Thierry Reding 2015-07-13 12:39 ` [PATCH V3 07/19] soc: tegra: pmc: Wait for powergate state to change Jon Hunter 2015-07-13 12:39 ` Jon Hunter [not found] ` <1436791197-32358-8-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-17 10:17 ` Thierry Reding 2015-07-17 10:17 ` Thierry Reding 2015-07-21 9:34 ` Jon Hunter 2015-07-21 9:34 ` Jon Hunter 2015-07-13 12:39 ` [PATCH V3 08/19] soc: tegra: pmc: Clean-up PMC helper functions Jon Hunter 2015-07-13 12:39 ` Jon Hunter 2015-07-17 10:25 ` Thierry Reding 2015-07-17 10:25 ` Thierry Reding 2015-07-21 9:38 ` Jon Hunter 2015-07-21 9:38 ` Jon Hunter 2015-07-13 12:39 ` [PATCH V3 14/19] Documentation: DT: bindings: Add power domain info for NVIDIA PMC Jon Hunter 2015-07-13 12:39 ` Jon Hunter [not found] ` <1436791197-32358-15-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-17 9:38 ` Thierry Reding 2015-07-17 9:38 ` Thierry Reding 2015-07-13 12:39 ` [PATCH V3 15/19] soc: tegra: pmc: Add generic PM domain support Jon Hunter 2015-07-13 12:39 ` Jon Hunter [not found] ` <1436791197-32358-16-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-17 11:29 ` Thierry Reding 2015-07-17 11:29 ` Thierry Reding 2015-07-13 12:39 ` Jon Hunter [this message] 2015-07-13 12:39 ` [PATCH V3 16/19] soc: tegra: pmc: Remove the deprecated powergate APIs Jon Hunter 2015-07-13 12:39 ` [PATCH V3 18/19] ARM: tegra: add GPU power supply to Jetson TK1 DT Jon Hunter 2015-07-13 12:39 ` Jon Hunter [not found] ` <1436791197-32358-19-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-17 9:28 ` Thierry Reding 2015-07-17 9:28 ` Thierry Reding 2015-07-13 12:39 ` [PATCH V3 19/19] ARM: tegra: select PM_GENERIC_DOMAINS Jon Hunter 2015-07-13 12:39 ` Jon Hunter 2015-07-13 13:50 ` Peter De Schrijver 2015-07-13 13:50 ` Peter De Schrijver [not found] ` <20150713135047.GR6287-Rysk9IDjsxmJz7etNGeUX8VPkgjIgRvpAL8bYrjMMd8@public.gmane.org> 2015-07-13 14:03 ` Jon Hunter 2015-07-13 14:03 ` Jon Hunter 2015-07-14 11:59 ` Jon Hunter 2015-07-14 11:59 ` Jon Hunter 2015-07-14 11:59 ` Jon Hunter [not found] ` <55A4F9B6.1070904-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-15 8:17 ` Peter De Schrijver 2015-07-15 8:17 ` Peter De Schrijver 2015-07-13 12:39 ` [PATCH V3 09/19] soc: tegra: pmc: Prepare for migrating to generic PM domains Jon Hunter 2015-07-13 12:39 ` Jon Hunter 2015-07-13 12:39 ` [PATCH V3 10/19] drm/tegra: dc: Prepare for " Jon Hunter 2015-07-13 12:39 ` Jon Hunter [not found] ` <1436791197-32358-11-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-17 10:41 ` Thierry Reding 2015-07-17 10:41 ` Thierry Reding 2015-07-28 8:30 ` Jon Hunter 2015-07-28 8:30 ` Jon Hunter [not found] ` <55B73D8C.103-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> 2015-07-28 11:20 ` Thierry Reding 2015-07-28 11:20 ` Thierry Reding [not found] ` <20150728112030.GA10949-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org> 2015-07-28 15:30 ` Jon Hunter 2015-07-28 15:30 ` Jon Hunter 2015-07-13 12:39 ` [PATCH V3 11/19] PCI: tegra: Add support " Jon Hunter 2015-07-13 12:39 ` Jon Hunter 2015-07-17 10:45 ` Thierry Reding 2015-07-17 10:45 ` Thierry Reding 2015-07-28 8:35 ` Jon Hunter 2015-07-28 8:35 ` Jon Hunter 2015-07-13 12:39 ` [PATCH V3 12/19] ata: ahci_tegra: " Jon Hunter 2015-07-13 12:39 ` Jon Hunter 2015-07-13 12:39 ` [PATCH V3 13/19] drm/tegra: gr3d: " Jon Hunter 2015-07-13 12:39 ` Jon Hunter 2015-07-13 12:39 ` [PATCH V3 17/19] ARM: tegra: Add PM domain device nodes to Tegra124 DT Jon Hunter 2015-07-13 12:39 ` Jon Hunter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1436791197-32358-17-git-send-email-jonathanh@nvidia.com \ --to=jonathanh-ddmlm1+adcrqt0dzr+alfa@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \ --cc=khilman-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \ --cc=pdeschrijver-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \ --cc=pgaikwad-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \ --cc=rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org \ --cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \ --cc=tbergstrom-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \ --cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=vinceh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.