From: Aapo Vienamo <avienamo@nvidia.com> To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com>, Ulf Hansson <ulf.hansson@linaro.org>, Adrian Hunter <adrian.hunter@intel.com>, Mikko Perttunen <mperttunen@nvidia.com>, Stefan Agner <stefan@agner.ch> Cc: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Aapo Vienamo <avienamo@nvidia.com> Subject: [PATCH v3 09/38] soc/tegra: pmc: Remove public pad voltage APIs Date: Thu, 30 Aug 2018 18:06:10 +0300 [thread overview] Message-ID: <20180830150639.21048-10-avienamo@nvidia.com> (raw) In-Reply-To: <20180830150639.21048-1-avienamo@nvidia.com> Make tegra_io_pad_set_voltage() and tegra_io_pad_get_voltage() static and remove the prototypes from pmc.h. Remove enum tegra_io_pad_voltage and use the defines from <dt-bindings/pinctrl/pinctrl-tegra-io-pad.h> instead. These functions aren't used outside of the pmc driver and new use cases should use the pinctrl interface instead. Signed-off-by: Aapo Vienamo <avienamo@nvidia.com> Acked-by: Jon Hunter <jonathanh@nvidia.com> Acked-by: Thierry Reding <treding@nvidia.com> --- drivers/soc/tegra/pmc.c | 17 ++++++++--------- include/soc/tegra/pmc.h | 19 ------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index 3b844b0fd8ac..de6832df2e9a 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -45,6 +45,8 @@ #include <soc/tegra/fuse.h> #include <soc/tegra/pmc.h> +#include <dt-bindings/pinctrl/pinctrl-tegra-io-pad.h> + #define PMC_CNTRL 0x0 #define PMC_CNTRL_INTR_POLARITY BIT(17) /* inverts INTR polarity */ #define PMC_CNTRL_CPU_PWRREQ_OE BIT(16) /* CPU pwr req enable */ @@ -1091,8 +1093,7 @@ static int tegra_io_pad_is_powered(enum tegra_io_pad id) return !(value & mask); } -int tegra_io_pad_set_voltage(enum tegra_io_pad id, - enum tegra_io_pad_voltage voltage) +static int tegra_io_pad_set_voltage(enum tegra_io_pad id, int voltage) { const struct tegra_io_pad_soc *pad; u32 value; @@ -1109,7 +1110,7 @@ int tegra_io_pad_set_voltage(enum tegra_io_pad id, if (pmc->soc->has_impl_33v_pwr) { value = tegra_pmc_readl(PMC_IMPL_E_33V_PWR); - if (voltage == TEGRA_IO_PAD_1800000UV) + if (voltage == TEGRA_IO_PAD_VOLTAGE_1V8) value &= ~BIT(pad->voltage); else value |= BIT(pad->voltage); @@ -1124,7 +1125,7 @@ int tegra_io_pad_set_voltage(enum tegra_io_pad id, /* update I/O voltage */ value = tegra_pmc_readl(PMC_PWR_DET_VALUE); - if (voltage == TEGRA_IO_PAD_1800000UV) + if (voltage == TEGRA_IO_PAD_VOLTAGE_1V8) value &= ~BIT(pad->voltage); else value |= BIT(pad->voltage); @@ -1138,9 +1139,8 @@ int tegra_io_pad_set_voltage(enum tegra_io_pad id, return 0; } -EXPORT_SYMBOL(tegra_io_pad_set_voltage); -int tegra_io_pad_get_voltage(enum tegra_io_pad id) +static int tegra_io_pad_get_voltage(enum tegra_io_pad id) { const struct tegra_io_pad_soc *pad; u32 value; @@ -1158,11 +1158,10 @@ int tegra_io_pad_get_voltage(enum tegra_io_pad id) value = tegra_pmc_readl(PMC_PWR_DET_VALUE); if ((value & BIT(pad->voltage)) == 0) - return TEGRA_IO_PAD_1800000UV; + return TEGRA_IO_PAD_VOLTAGE_1V8; - return TEGRA_IO_PAD_3300000UV; + return TEGRA_IO_PAD_VOLTAGE_3V3; } -EXPORT_SYMBOL(tegra_io_pad_get_voltage); /** * tegra_io_rail_power_on() - enable power to I/O rail diff --git a/include/soc/tegra/pmc.h b/include/soc/tegra/pmc.h index 445aa66514e9..562426812ab2 100644 --- a/include/soc/tegra/pmc.h +++ b/include/soc/tegra/pmc.h @@ -141,16 +141,6 @@ enum tegra_io_pad { #define TEGRA_IO_RAIL_HDMI TEGRA_IO_PAD_HDMI #define TEGRA_IO_RAIL_LVDS TEGRA_IO_PAD_LVDS -/** - * enum tegra_io_pad_voltage - voltage level of the I/O pad's source rail - * @TEGRA_IO_PAD_1800000UV: 1.8 V - * @TEGRA_IO_PAD_3300000UV: 3.3 V - */ -enum tegra_io_pad_voltage { - TEGRA_IO_PAD_1800000UV, - TEGRA_IO_PAD_3300000UV, -}; - #ifdef CONFIG_SOC_TEGRA_PMC int tegra_powergate_is_powered(unsigned int id); int tegra_powergate_power_on(unsigned int id); @@ -163,9 +153,6 @@ int tegra_powergate_sequence_power_up(unsigned int id, struct clk *clk, int tegra_io_pad_power_enable(enum tegra_io_pad id); int tegra_io_pad_power_disable(enum tegra_io_pad id); -int tegra_io_pad_set_voltage(enum tegra_io_pad id, - enum tegra_io_pad_voltage voltage); -int tegra_io_pad_get_voltage(enum tegra_io_pad id); /* deprecated, use tegra_io_pad_power_{enable,disable}() instead */ int tegra_io_rail_power_on(unsigned int id); @@ -213,12 +200,6 @@ static inline int tegra_io_pad_power_disable(enum tegra_io_pad id) return -ENOSYS; } -static inline int tegra_io_pad_set_voltage(enum tegra_io_pad id, - enum tegra_io_pad_voltage voltage) -{ - return -ENOSYS; -} - static inline int tegra_io_pad_get_voltage(enum tegra_io_pad id) { return -ENOSYS; -- 2.18.0
WARNING: multiple messages have this Message-ID (diff)
From: Aapo Vienamo <avienamo@nvidia.com> To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com>, Ulf Hansson <ulf.hansson@linaro.org>, Adrian Hunter <adrian.hunter@intel.com>, Mikko Perttunen <mperttunen@nvidia.com>, Stefan Agner <stefan@agner.ch> Cc: <devicetree@vger.kernel.org>, <linux-tegra@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-mmc@vger.kernel.org>, Aapo Vienamo <avienamo@nvidia.com> Subject: [PATCH v3 09/38] soc/tegra: pmc: Remove public pad voltage APIs Date: Thu, 30 Aug 2018 18:06:10 +0300 [thread overview] Message-ID: <20180830150639.21048-10-avienamo@nvidia.com> (raw) In-Reply-To: <20180830150639.21048-1-avienamo@nvidia.com> Make tegra_io_pad_set_voltage() and tegra_io_pad_get_voltage() static and remove the prototypes from pmc.h. Remove enum tegra_io_pad_voltage and use the defines from <dt-bindings/pinctrl/pinctrl-tegra-io-pad.h> instead. These functions aren't used outside of the pmc driver and new use cases should use the pinctrl interface instead. Signed-off-by: Aapo Vienamo <avienamo@nvidia.com> Acked-by: Jon Hunter <jonathanh@nvidia.com> Acked-by: Thierry Reding <treding@nvidia.com> --- drivers/soc/tegra/pmc.c | 17 ++++++++--------- include/soc/tegra/pmc.h | 19 ------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index 3b844b0fd8ac..de6832df2e9a 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -45,6 +45,8 @@ #include <soc/tegra/fuse.h> #include <soc/tegra/pmc.h> +#include <dt-bindings/pinctrl/pinctrl-tegra-io-pad.h> + #define PMC_CNTRL 0x0 #define PMC_CNTRL_INTR_POLARITY BIT(17) /* inverts INTR polarity */ #define PMC_CNTRL_CPU_PWRREQ_OE BIT(16) /* CPU pwr req enable */ @@ -1091,8 +1093,7 @@ static int tegra_io_pad_is_powered(enum tegra_io_pad id) return !(value & mask); } -int tegra_io_pad_set_voltage(enum tegra_io_pad id, - enum tegra_io_pad_voltage voltage) +static int tegra_io_pad_set_voltage(enum tegra_io_pad id, int voltage) { const struct tegra_io_pad_soc *pad; u32 value; @@ -1109,7 +1110,7 @@ int tegra_io_pad_set_voltage(enum tegra_io_pad id, if (pmc->soc->has_impl_33v_pwr) { value = tegra_pmc_readl(PMC_IMPL_E_33V_PWR); - if (voltage == TEGRA_IO_PAD_1800000UV) + if (voltage == TEGRA_IO_PAD_VOLTAGE_1V8) value &= ~BIT(pad->voltage); else value |= BIT(pad->voltage); @@ -1124,7 +1125,7 @@ int tegra_io_pad_set_voltage(enum tegra_io_pad id, /* update I/O voltage */ value = tegra_pmc_readl(PMC_PWR_DET_VALUE); - if (voltage == TEGRA_IO_PAD_1800000UV) + if (voltage == TEGRA_IO_PAD_VOLTAGE_1V8) value &= ~BIT(pad->voltage); else value |= BIT(pad->voltage); @@ -1138,9 +1139,8 @@ int tegra_io_pad_set_voltage(enum tegra_io_pad id, return 0; } -EXPORT_SYMBOL(tegra_io_pad_set_voltage); -int tegra_io_pad_get_voltage(enum tegra_io_pad id) +static int tegra_io_pad_get_voltage(enum tegra_io_pad id) { const struct tegra_io_pad_soc *pad; u32 value; @@ -1158,11 +1158,10 @@ int tegra_io_pad_get_voltage(enum tegra_io_pad id) value = tegra_pmc_readl(PMC_PWR_DET_VALUE); if ((value & BIT(pad->voltage)) == 0) - return TEGRA_IO_PAD_1800000UV; + return TEGRA_IO_PAD_VOLTAGE_1V8; - return TEGRA_IO_PAD_3300000UV; + return TEGRA_IO_PAD_VOLTAGE_3V3; } -EXPORT_SYMBOL(tegra_io_pad_get_voltage); /** * tegra_io_rail_power_on() - enable power to I/O rail diff --git a/include/soc/tegra/pmc.h b/include/soc/tegra/pmc.h index 445aa66514e9..562426812ab2 100644 --- a/include/soc/tegra/pmc.h +++ b/include/soc/tegra/pmc.h @@ -141,16 +141,6 @@ enum tegra_io_pad { #define TEGRA_IO_RAIL_HDMI TEGRA_IO_PAD_HDMI #define TEGRA_IO_RAIL_LVDS TEGRA_IO_PAD_LVDS -/** - * enum tegra_io_pad_voltage - voltage level of the I/O pad's source rail - * @TEGRA_IO_PAD_1800000UV: 1.8 V - * @TEGRA_IO_PAD_3300000UV: 3.3 V - */ -enum tegra_io_pad_voltage { - TEGRA_IO_PAD_1800000UV, - TEGRA_IO_PAD_3300000UV, -}; - #ifdef CONFIG_SOC_TEGRA_PMC int tegra_powergate_is_powered(unsigned int id); int tegra_powergate_power_on(unsigned int id); @@ -163,9 +153,6 @@ int tegra_powergate_sequence_power_up(unsigned int id, struct clk *clk, int tegra_io_pad_power_enable(enum tegra_io_pad id); int tegra_io_pad_power_disable(enum tegra_io_pad id); -int tegra_io_pad_set_voltage(enum tegra_io_pad id, - enum tegra_io_pad_voltage voltage); -int tegra_io_pad_get_voltage(enum tegra_io_pad id); /* deprecated, use tegra_io_pad_power_{enable,disable}() instead */ int tegra_io_rail_power_on(unsigned int id); @@ -213,12 +200,6 @@ static inline int tegra_io_pad_power_disable(enum tegra_io_pad id) return -ENOSYS; } -static inline int tegra_io_pad_set_voltage(enum tegra_io_pad id, - enum tegra_io_pad_voltage voltage) -{ - return -ENOSYS; -} - static inline int tegra_io_pad_get_voltage(enum tegra_io_pad id) { return -ENOSYS; -- 2.18.0
next prev parent reply other threads:[~2018-08-30 15:06 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-30 15:06 [PATCH v3 00/38] Tegra SDHCI add support for HS200 and UHS signaling Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 01/38] dt-bindings: Add Tegra PMC pad configuration bindings Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 02/38] dt-bindings: mmc: tegra: Add pad voltage control properties Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-31 13:15 ` Ulf Hansson 2018-08-30 15:06 ` [PATCH v3 03/38] dt-bindings: Add Tegra SDHCI pad pdpu offset bindings Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-31 13:15 ` Ulf Hansson 2018-08-30 15:06 ` [PATCH v3 04/38] dt-bindings: mmc: Add Tegra SDHCI sampling trimmer values Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-31 13:15 ` Ulf Hansson 2018-08-30 15:06 ` [PATCH v3 05/38] soc/tegra: pmc: Fix pad voltage configuration for Tegra186 Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 06/38] soc/tegra: pmc: Factor out DPD register bit calculation Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 07/38] soc/tegra: pmc: Implement tegra_io_pad_is_powered() Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 08/38] soc/tegra: pmc: Use X macro to generate IO pad tables Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo [this message] 2018-08-30 15:06 ` [PATCH v3 09/38] soc/tegra: pmc: Remove public pad voltage APIs Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 10/38] soc/tegra: pmc: Implement pad configuration via pinctrl Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 11/38] mmc: tegra: Reconfigure pad voltages during voltage switching Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-31 13:16 ` Ulf Hansson 2018-08-31 13:59 ` Thierry Reding 2018-08-30 15:06 ` [PATCH v3 12/38] mmc: tegra: Poll for calibration completion Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 13/38] mmc: tegra: Set calibration pad voltage reference Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 14/38] mmc: tegra: Power on the calibration pad Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 15/38] mmc: tegra: Disable card clock during pad calibration Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 16/38] mmc: tegra: Program pad autocal offsets from dt Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 17/38] mmc: tegra: Perform pad calibration after voltage switch Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 18/38] mmc: tegra: Enable pad calibration on Tegra210 and Tegra186 Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 19/38] mmc: tegra: Add a workaround for tap value change glitch Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 20/38] mmc: tegra: Parse default trim and tap from dt Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 21/38] mmc: tegra: Configure default tap values Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 22/38] mmc: tegra: Configure default trim value on reset Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 23/38] mmc: tegra: Use standard SDHCI tuning on Tegra210 and Tegra186 Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 24/38] mmc: tegra: Remove tegra_sdhci_writew() from tegra210_sdhci_ops Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 25/38] mmc: tegra: Disable card clock during tuning cmd on Tegra210 Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 26/38] mmc: tegra: Enable UHS and HS200 modes for Tegra210 Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 27/38] mmc: tegra: Enable UHS and HS200 modes for Tegra186 Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 28/38] arm64: dts: Add Tegra210 sdmmc pinctrl voltage states Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 29/38] arm64: dts: Add Tegra186 " Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 30/38] arm64: dts: tegra210-p2180: Allow ldo2 to go down to 1.8 V Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 31/38] arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 32/38] arm64: dts: tegra210-p2597: Remove no-1-8-v from sdmmc1 Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 33/38] arm64: dts: tegra186: Add sdmmc pad auto calibration offsets Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 34/38] arm64: dts: tegra210: " Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 35/38] arm64: dts: tegra210: Add SDHCI tap and trim values Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 36/38] arm64: dts: tegra186: " Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 37/38] arm64: dts: tegra186: Assign clocks for sdmmc1 and sdmmc4 Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-30 15:06 ` [PATCH v3 38/38] arm64: dts: tegra210: " Aapo Vienamo 2018-08-30 15:06 ` Aapo Vienamo 2018-08-31 7:20 ` [PATCH v3 00/38] Tegra SDHCI add support for HS200 and UHS signaling Adrian 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=20180830150639.21048-10-avienamo@nvidia.com \ --to=avienamo@nvidia.com \ --cc=adrian.hunter@intel.com \ --cc=devicetree@vger.kernel.org \ --cc=jonathanh@nvidia.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-tegra@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mperttunen@nvidia.com \ --cc=robh+dt@kernel.org \ --cc=stefan@agner.ch \ --cc=thierry.reding@gmail.com \ --cc=ulf.hansson@linaro.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.