[v2,6/7] soc/tegra: pmc: Remove public pad voltage APIs

Message ID 1531317938-4099-1-git-send-email-avienamo@nvidia.com
State Superseded
Headers show
Series
  • Tegra PMC pinctrl pad configuration
Related show

Commit Message

Aapo Vienamo July 11, 2018, 2:05 p.m.
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>
---
 drivers/soc/tegra/pmc.c | 17 ++++++++---------
 include/soc/tegra/pmc.h | 13 -------------
 2 files changed, 8 insertions(+), 22 deletions(-)

Comments

Jon Hunter July 11, 2018, 3:30 p.m. | #1
Adding Laxman ...

On 11/07/18 15:05, Aapo Vienamo wrote:
> 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>
> ---
>  drivers/soc/tegra/pmc.c | 17 ++++++++---------
>  include/soc/tegra/pmc.h | 13 -------------
>  2 files changed, 8 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
> index f68dbfa..8926831 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 */
> @@ -1093,8 +1095,7 @@ int tegra_io_pad_is_powered(enum tegra_io_pad id)
>  }
>  EXPORT_SYMBOL(tegra_io_pad_is_powered);
>  
> -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;
> @@ -1110,7 +1111,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_3V3)
>  			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 14206e8..b6294f6 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);
> @@ -164,9 +154,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_is_powered(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);
> 

Acked-by: Jon Hunter <jonathanh@nvidia.com>

Cheers
Jon
kbuild test robot July 12, 2018, 12:05 a.m. | #2
Hi Aapo,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on tegra/for-next]
[also build test WARNING on v4.18-rc4 next-20180711]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Aapo-Vienamo/soc-tegra-pmc-Fix-pad-voltage-configuration-for-Tegra186/20180712-053245
base:   https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git for-next
config: i386-allmodconfig (attached as .config)
compiler: gcc-7 (Debian 7.3.0-16) 7.3.0
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All warnings (new ones prefixed by >>):

   In file included from drivers/pci/controller/pci-tegra.c:41:0:
>> include/soc/tegra/pmc.h:205:14: warning: 'enum tegra_io_pad_voltage' declared inside parameter list will not be visible outside of this definition or declaration
            enum tegra_io_pad_voltage voltage)
                 ^~~~~~~~~~~~~~~~~~~~
   include/soc/tegra/pmc.h:205:35: error: parameter 2 ('voltage') has incomplete type
            enum tegra_io_pad_voltage voltage)
                                      ^~~~~~~
   include/soc/tegra/pmc.h:204:19: error: function declaration isn't a prototype [-Werror=strict-prototypes]
    static inline int tegra_io_pad_set_voltage(enum tegra_io_pad id,
                      ^~~~~~~~~~~~~~~~~~~~~~~~
   cc1: some warnings being treated as errors

vim +205 include/soc/tegra/pmc.h

21b49910 Laxman Dewangan 2016-10-10  203  
21b49910 Laxman Dewangan 2016-10-10  204  static inline int tegra_io_pad_set_voltage(enum tegra_io_pad id,
21b49910 Laxman Dewangan 2016-10-10 @205  					   enum tegra_io_pad_voltage voltage)
21b49910 Laxman Dewangan 2016-10-10  206  {
21b49910 Laxman Dewangan 2016-10-10  207  	return -ENOSYS;
21b49910 Laxman Dewangan 2016-10-10  208  }
21b49910 Laxman Dewangan 2016-10-10  209  

:::::: The code at line 205 was first introduced by commit
:::::: 21b4991051780b49b217c363f79366ed94c3b4b7 soc/tegra: pmc: Add I/O pad voltage support

:::::: TO: Laxman Dewangan <ldewangan@nvidia.com>
:::::: CC: Thierry Reding <treding@nvidia.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Patch

diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
index f68dbfa..8926831 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 */
@@ -1093,8 +1095,7 @@  int tegra_io_pad_is_powered(enum tegra_io_pad id)
 }
 EXPORT_SYMBOL(tegra_io_pad_is_powered);
 
-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;
@@ -1110,7 +1111,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_3V3)
 			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 14206e8..b6294f6 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);
@@ -164,9 +154,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_is_powered(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);