Re: [U-Boot] [PATCH v3 10/10] pinctrl: rockchip: Also move common set_schmitter func into per Soc file【请注意，邮件由u-boot-boun...@lists.denx.de代发】

2019-05-08 Thread Kever Yang 


On 05/07/2019 11:44 AM, Kever Yang wrote:
>
> On 04/16/2019 09:58 PM, David Wu wrote:
>> Only some Soc need Schmitter feature, so move the
>> implementation into their own files.
>>
>> Signed-off-by: David Wu 
> Reviewed-by: Kever Yang 

Applied to u-boot-rockchip, thanks!

>
> Thanks,
> - Kever
>> ---
>>
>> Change in v3:
>> - None
>>
>>  drivers/pinctrl/rockchip/pinctrl-rk3328.c | 17 -
>>  .../pinctrl/rockchip/pinctrl-rockchip-core.c  | 19 +++
>>  drivers/pinctrl/rockchip/pinctrl-rockchip.h   |  5 ++---
>>  drivers/pinctrl/rockchip/pinctrl-rv1108.c | 17 -
>>  4 files changed, 37 insertions(+), 21 deletions(-)
>>
>> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c 
>> b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
>> index d4d37af206..8d37a6f945 100644
>> --- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c
>> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
>> @@ -264,6 +264,21 @@ static int rk3328_calc_schmitt_reg_and_bit(struct 
>> rockchip_pin_bank *bank,
>>  return 0;
>>  }
>>  
>> +static int rk3328_set_schmitt(struct rockchip_pin_bank *bank,
>> +  int pin_num, int enable)
>> +{
>> +struct regmap *regmap;
>> +int reg;
>> +u8 bit;
>> +u32 data;
>> +
>> +rk3328_calc_schmitt_reg_and_bit(bank, pin_num, , , );
>> +/* enable the write to the equivalent lower bits */
>> +data = BIT(bit + 16) | (enable << bit);
>> +
>> +return regmap_write(regmap, reg, data);
>> +}
>> +
>>  static struct rockchip_pin_bank rk3328_pin_banks[] = {
>>  PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", 0, 0, 0, 0),
>>  PIN_BANK_IOMUX_FLAGS(1, 32, "gpio1", 0, 0, 0, 0),
>> @@ -289,7 +304,7 @@ static struct rockchip_pin_ctrl rk3328_pin_ctrl = {
>>  .set_mux= rk3328_set_mux,
>>  .set_pull   = rk3328_set_pull,
>>  .set_drive  = rk3328_set_drive,
>> -.schmitt_calc_reg   = rk3328_calc_schmitt_reg_and_bit,
>> +.set_schmitt= rk3328_set_schmitt,
>>  };
>>  
>>  static const struct udevice_id rk3328_pinctrl_ids[] = {
>> diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c 
>> b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
>> index b3379a0d3f..80dc431d20 100644
>> --- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
>> +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
>> @@ -306,30 +306,20 @@ static int rockchip_set_schmitt(struct 
>> rockchip_pin_bank *bank,
>>  {
>>  struct rockchip_pinctrl_priv *priv = bank->priv;
>>  struct rockchip_pin_ctrl *ctrl = priv->ctrl;
>> -struct regmap *regmap;
>> -int reg, ret;
>> -u8 bit;
>> -u32 data;
>>  
>>  debug("setting input schmitt of GPIO%d-%d to %d\n", bank->bank_num,
>>pin_num, enable);
>>  
>> -ret = ctrl->schmitt_calc_reg(bank, pin_num, , , );
>> -if (ret)
>> -return ret;
>> -
>> -/* enable the write to the equivalent lower bits */
>> -data = BIT(bit + 16) | (enable << bit);
>> +if (!ctrl->set_schmitt)
>> +return -ENOTSUPP;
>>  
>> -return regmap_write(regmap, reg, data);
>> +return ctrl->set_schmitt(bank, pin_num, enable);
>>  }
>>  
>>  /* set the pin config settings for a specified pin */
>>  static int rockchip_pinconf_set(struct rockchip_pin_bank *bank,
>>  u32 pin, u32 param, u32 arg)
>>  {
>> -struct rockchip_pinctrl_priv *priv = bank->priv;
>> -struct rockchip_pin_ctrl *ctrl = priv->ctrl;
>>  int rc;
>>  
>>  switch (param) {
>> @@ -350,9 +340,6 @@ static int rockchip_pinconf_set(struct rockchip_pin_bank 
>> *bank,
>>  break;
>>  
>>  case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
>> -if (!ctrl->schmitt_calc_reg)
>> -return -ENOTSUPP;
>> -
>>  rc = rockchip_set_schmitt(bank, pin, arg);
>>  if (rc < 0)
>>  return rc;
>> diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip.h 
>> b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
>> index 1c6fc2c5b2..9651e9c7a6 100644
>> --- a/drivers/pinctrl/rockchip/pinctrl-rockchip.h
>> +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
>> @@ -271,9 +271,8 @@ struct rockchip_pin_ctrl {
>>  int pin_num, int pull);
>>  int (*set_drive)(struct rockchip_pin_bank *bank,
>>   int pin_num, int strength);
>> -int (*schmitt_calc_reg)(struct rockchip_pin_bank *bank,
>> -int pin_num, struct regmap **regmap,
>> -int *reg, u8 *bit);
>> +int (*set_schmitt)(struct rockchip_pin_bank *bank,
>> +   int pin_num, int enable);
>>  };
>>  
>>  /**
>> diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c 
>> b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
>> index 0bcf11bb41..54610a3e90 100644
>> --- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c
>> +++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
>> @@ -237,6

Re: [U-Boot] [PATCH v3 10/10] pinctrl: rockchip: Also move common set_schmitter func into per Soc file

2019-05-06 Thread Kever Yang 


On 04/16/2019 09:58 PM, David Wu wrote:
> Only some Soc need Schmitter feature, so move the
> implementation into their own files.
>
> Signed-off-by: David Wu 

Reviewed-by: Kever Yang 

Thanks,
- Kever
> ---
>
> Change in v3:
> - None
>
>  drivers/pinctrl/rockchip/pinctrl-rk3328.c | 17 -
>  .../pinctrl/rockchip/pinctrl-rockchip-core.c  | 19 +++
>  drivers/pinctrl/rockchip/pinctrl-rockchip.h   |  5 ++---
>  drivers/pinctrl/rockchip/pinctrl-rv1108.c | 17 -
>  4 files changed, 37 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c 
> b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
> index d4d37af206..8d37a6f945 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
> @@ -264,6 +264,21 @@ static int rk3328_calc_schmitt_reg_and_bit(struct 
> rockchip_pin_bank *bank,
>   return 0;
>  }
>  
> +static int rk3328_set_schmitt(struct rockchip_pin_bank *bank,
> +   int pin_num, int enable)
> +{
> + struct regmap *regmap;
> + int reg;
> + u8 bit;
> + u32 data;
> +
> + rk3328_calc_schmitt_reg_and_bit(bank, pin_num, , , );
> + /* enable the write to the equivalent lower bits */
> + data = BIT(bit + 16) | (enable << bit);
> +
> + return regmap_write(regmap, reg, data);
> +}
> +
>  static struct rockchip_pin_bank rk3328_pin_banks[] = {
>   PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", 0, 0, 0, 0),
>   PIN_BANK_IOMUX_FLAGS(1, 32, "gpio1", 0, 0, 0, 0),
> @@ -289,7 +304,7 @@ static struct rockchip_pin_ctrl rk3328_pin_ctrl = {
>   .set_mux= rk3328_set_mux,
>   .set_pull   = rk3328_set_pull,
>   .set_drive  = rk3328_set_drive,
> - .schmitt_calc_reg   = rk3328_calc_schmitt_reg_and_bit,
> + .set_schmitt= rk3328_set_schmitt,
>  };
>  
>  static const struct udevice_id rk3328_pinctrl_ids[] = {
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c 
> b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
> index b3379a0d3f..80dc431d20 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
> @@ -306,30 +306,20 @@ static int rockchip_set_schmitt(struct 
> rockchip_pin_bank *bank,
>  {
>   struct rockchip_pinctrl_priv *priv = bank->priv;
>   struct rockchip_pin_ctrl *ctrl = priv->ctrl;
> - struct regmap *regmap;
> - int reg, ret;
> - u8 bit;
> - u32 data;
>  
>   debug("setting input schmitt of GPIO%d-%d to %d\n", bank->bank_num,
> pin_num, enable);
>  
> - ret = ctrl->schmitt_calc_reg(bank, pin_num, , , );
> - if (ret)
> - return ret;
> -
> - /* enable the write to the equivalent lower bits */
> - data = BIT(bit + 16) | (enable << bit);
> + if (!ctrl->set_schmitt)
> + return -ENOTSUPP;
>  
> - return regmap_write(regmap, reg, data);
> + return ctrl->set_schmitt(bank, pin_num, enable);
>  }
>  
>  /* set the pin config settings for a specified pin */
>  static int rockchip_pinconf_set(struct rockchip_pin_bank *bank,
>   u32 pin, u32 param, u32 arg)
>  {
> - struct rockchip_pinctrl_priv *priv = bank->priv;
> - struct rockchip_pin_ctrl *ctrl = priv->ctrl;
>   int rc;
>  
>   switch (param) {
> @@ -350,9 +340,6 @@ static int rockchip_pinconf_set(struct rockchip_pin_bank 
> *bank,
>   break;
>  
>   case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
> - if (!ctrl->schmitt_calc_reg)
> - return -ENOTSUPP;
> -
>   rc = rockchip_set_schmitt(bank, pin, arg);
>   if (rc < 0)
>   return rc;
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip.h 
> b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
> index 1c6fc2c5b2..9651e9c7a6 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rockchip.h
> +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
> @@ -271,9 +271,8 @@ struct rockchip_pin_ctrl {
>   int pin_num, int pull);
>   int (*set_drive)(struct rockchip_pin_bank *bank,
>int pin_num, int strength);
> - int (*schmitt_calc_reg)(struct rockchip_pin_bank *bank,
> - int pin_num, struct regmap **regmap,
> - int *reg, u8 *bit);
> + int (*set_schmitt)(struct rockchip_pin_bank *bank,
> +int pin_num, int enable);
>  };
>  
>  /**
> diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c 
> b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
> index 0bcf11bb41..54610a3e90 100644
> --- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c
> +++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
> @@ -237,6 +237,21 @@ static int rv1108_calc_schmitt_reg_and_bit(struct 
> rockchip_pin_bank *bank,
>   return 0;
>  }
>  
> +static int rv1108_set_schmitt(struct

[U-Boot] [PATCH v3 10/10] pinctrl: rockchip: Also move common set_schmitter func into per Soc file

2019-04-16 Thread David Wu 
Only some Soc need Schmitter feature, so move the
implementation into their own files.

Signed-off-by: David Wu 
---

Change in v3:
- None

 drivers/pinctrl/rockchip/pinctrl-rk3328.c | 17 -
 .../pinctrl/rockchip/pinctrl-rockchip-core.c  | 19 +++
 drivers/pinctrl/rockchip/pinctrl-rockchip.h   |  5 ++---
 drivers/pinctrl/rockchip/pinctrl-rv1108.c | 17 -
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c 
b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
index d4d37af206..8d37a6f945 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c
@@ -264,6 +264,21 @@ static int rk3328_calc_schmitt_reg_and_bit(struct 
rockchip_pin_bank *bank,
return 0;
 }
 
+static int rk3328_set_schmitt(struct rockchip_pin_bank *bank,
+ int pin_num, int enable)
+{
+   struct regmap *regmap;
+   int reg;
+   u8 bit;
+   u32 data;
+
+   rk3328_calc_schmitt_reg_and_bit(bank, pin_num, , , );
+   /* enable the write to the equivalent lower bits */
+   data = BIT(bit + 16) | (enable << bit);
+
+   return regmap_write(regmap, reg, data);
+}
+
 static struct rockchip_pin_bank rk3328_pin_banks[] = {
PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", 0, 0, 0, 0),
PIN_BANK_IOMUX_FLAGS(1, 32, "gpio1", 0, 0, 0, 0),
@@ -289,7 +304,7 @@ static struct rockchip_pin_ctrl rk3328_pin_ctrl = {
.set_mux= rk3328_set_mux,
.set_pull   = rk3328_set_pull,
.set_drive  = rk3328_set_drive,
-   .schmitt_calc_reg   = rk3328_calc_schmitt_reg_and_bit,
+   .set_schmitt= rk3328_set_schmitt,
 };
 
 static const struct udevice_id rk3328_pinctrl_ids[] = {
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c 
b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
index b3379a0d3f..80dc431d20 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c
@@ -306,30 +306,20 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank 
*bank,
 {
struct rockchip_pinctrl_priv *priv = bank->priv;
struct rockchip_pin_ctrl *ctrl = priv->ctrl;
-   struct regmap *regmap;
-   int reg, ret;
-   u8 bit;
-   u32 data;
 
debug("setting input schmitt of GPIO%d-%d to %d\n", bank->bank_num,
  pin_num, enable);
 
-   ret = ctrl->schmitt_calc_reg(bank, pin_num, , , );
-   if (ret)
-   return ret;
-
-   /* enable the write to the equivalent lower bits */
-   data = BIT(bit + 16) | (enable << bit);
+   if (!ctrl->set_schmitt)
+   return -ENOTSUPP;
 
-   return regmap_write(regmap, reg, data);
+   return ctrl->set_schmitt(bank, pin_num, enable);
 }
 
 /* set the pin config settings for a specified pin */
 static int rockchip_pinconf_set(struct rockchip_pin_bank *bank,
u32 pin, u32 param, u32 arg)
 {
-   struct rockchip_pinctrl_priv *priv = bank->priv;
-   struct rockchip_pin_ctrl *ctrl = priv->ctrl;
int rc;
 
switch (param) {
@@ -350,9 +340,6 @@ static int rockchip_pinconf_set(struct rockchip_pin_bank 
*bank,
break;
 
case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
-   if (!ctrl->schmitt_calc_reg)
-   return -ENOTSUPP;
-
rc = rockchip_set_schmitt(bank, pin, arg);
if (rc < 0)
return rc;
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip.h 
b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
index 1c6fc2c5b2..9651e9c7a6 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rockchip.h
+++ b/drivers/pinctrl/rockchip/pinctrl-rockchip.h
@@ -271,9 +271,8 @@ struct rockchip_pin_ctrl {
int pin_num, int pull);
int (*set_drive)(struct rockchip_pin_bank *bank,
 int pin_num, int strength);
-   int (*schmitt_calc_reg)(struct rockchip_pin_bank *bank,
-   int pin_num, struct regmap **regmap,
-   int *reg, u8 *bit);
+   int (*set_schmitt)(struct rockchip_pin_bank *bank,
+  int pin_num, int enable);
 };
 
 /**
diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c 
b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
index 0bcf11bb41..54610a3e90 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c
@@ -237,6 +237,21 @@ static int rv1108_calc_schmitt_reg_and_bit(struct 
rockchip_pin_bank *bank,
return 0;
 }
 
+static int rv1108_set_schmitt(struct rockchip_pin_bank *bank,
+ int pin_num, int enable)
+{
+   struct regmap *regmap;
+   int reg;
+   u8 bit;
+   u32 data;
+
+   rv1108_calc_schmitt_reg_and_bit(bank, pin_num, , , );
+   /*