diff mbox series

[v2,04/11] gpio: stm32: add ops get_dir_flags

Message ID 20200604143022.v2.4.I10d17ebccc888338f2b9f23a803aee50c0f8e089@changeid
State Accepted
Delegated to: Patrick Delaunay
Headers show
Series stm32mp1: activate gpio hog support and add new pinctrl ops | expand

Commit Message

Patrick Delaunay June 4, 2020, 12:30 p.m. UTC
Add ops get_dir_flags() to read dir flags from GPIO registers.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
---

Changes in v2: None

 drivers/gpio/stm32_gpio.c | 59 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

Comments

Patrice CHOTARD July 2, 2020, 7:51 a.m. UTC | #1
Hi Patrick

On 6/4/20 2:30 PM, Patrick Delaunay wrote:
> Add ops get_dir_flags() to read dir flags from GPIO registers.
>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
> ---
>
> Changes in v2: None
>
>  drivers/gpio/stm32_gpio.c | 59 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 59 insertions(+)
>
> diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c
> index f120ee9808..5bff27f75b 100644
> --- a/drivers/gpio/stm32_gpio.c
> +++ b/drivers/gpio/stm32_gpio.c
> @@ -41,6 +41,11 @@ static void stm32_gpio_set_moder(struct stm32_gpio_regs *regs,
>  	clrsetbits_le32(&regs->moder, mask, mode << bits_index);
>  }
>  
> +static int stm32_gpio_get_moder(struct stm32_gpio_regs *regs, int idx)
> +{
> +	return (readl(&regs->moder) >> MODE_BITS(idx)) & MODE_BITS_MASK;
> +}
> +
>  static void stm32_gpio_set_otype(struct stm32_gpio_regs *regs,
>  				 int idx,
>  				 enum stm32_gpio_otype otype)
> @@ -51,6 +56,12 @@ static void stm32_gpio_set_otype(struct stm32_gpio_regs *regs,
>  	clrsetbits_le32(&regs->otyper, OTYPE_MSK << bits, otype << bits);
>  }
>  
> +static enum stm32_gpio_otype stm32_gpio_get_otype(struct stm32_gpio_regs *regs,
> +						  int idx)
> +{
> +	return (readl(&regs->otyper) >> OTYPE_BITS(idx)) & OTYPE_MSK;
> +}
> +
>  static void stm32_gpio_set_pupd(struct stm32_gpio_regs *regs,
>  				int idx,
>  				enum stm32_gpio_pupd pupd)
> @@ -61,6 +72,12 @@ static void stm32_gpio_set_pupd(struct stm32_gpio_regs *regs,
>  	clrsetbits_le32(&regs->pupdr, PUPD_MASK << bits, pupd << bits);
>  }
>  
> +static enum stm32_gpio_pupd stm32_gpio_get_pupd(struct stm32_gpio_regs *regs,
> +						int idx)
> +{
> +	return (readl(&regs->pupdr) >> PUPD_BITS(idx)) & PUPD_MASK;
> +}
> +
>  /*
>   * convert gpio offset to gpio index taking into account gpio holes
>   * into gpio bank
> @@ -202,6 +219,47 @@ static int stm32_gpio_set_dir_flags(struct udevice *dev, unsigned int offset,
>  	return 0;
>  }
>  
> +static int stm32_gpio_get_dir_flags(struct udevice *dev, unsigned int offset,
> +				    ulong *flags)
> +{
> +	struct stm32_gpio_priv *priv = dev_get_priv(dev);
> +	struct stm32_gpio_regs *regs = priv->regs;
> +	int idx;
> +	ulong dir_flags = 0;
> +
> +	idx = stm32_offset_to_index(dev, offset);
> +	if (idx < 0)
> +		return idx;
> +
> +	switch (stm32_gpio_get_moder(regs, idx)) {
> +	case STM32_GPIO_MODE_OUT:
> +		dir_flags |= GPIOD_IS_OUT;
> +		if (stm32_gpio_get_otype(regs, idx) == STM32_GPIO_OTYPE_OD)
> +			dir_flags |= GPIOD_OPEN_DRAIN;
> +		if (readl(&regs->idr) & BIT(idx))
> +			dir_flags |= GPIOD_IS_OUT_ACTIVE;
> +		break;
> +	case STM32_GPIO_MODE_IN:
> +		dir_flags |= GPIOD_IS_IN;
> +		switch (stm32_gpio_get_pupd(regs, idx)) {
> +		case STM32_GPIO_PUPD_UP:
> +			dir_flags |= GPIOD_PULL_UP;
> +			break;
> +		case STM32_GPIO_PUPD_DOWN:
> +			dir_flags |= GPIOD_PULL_DOWN;
> +			break;
> +		default:
> +			break;
> +		}
> +		break;
> +	default:
> +		break;
> +	}
> +	*flags = dir_flags;
> +
> +	return 0;
> +}
> +
>  static const struct dm_gpio_ops gpio_stm32_ops = {
>  	.direction_input	= stm32_gpio_direction_input,
>  	.direction_output	= stm32_gpio_direction_output,
> @@ -209,6 +267,7 @@ static const struct dm_gpio_ops gpio_stm32_ops = {
>  	.set_value		= stm32_gpio_set_value,
>  	.get_function		= stm32_gpio_get_function,
>  	.set_dir_flags		= stm32_gpio_set_dir_flags,
> +	.get_dir_flags		= stm32_gpio_get_dir_flags,
>  };
>  
>  static int gpio_stm32_probe(struct udevice *dev)

Reviewed-by: Patrice Chotard <patrice.chotard@st.com>

Thanks
diff mbox series

Patch

diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c
index f120ee9808..5bff27f75b 100644
--- a/drivers/gpio/stm32_gpio.c
+++ b/drivers/gpio/stm32_gpio.c
@@ -41,6 +41,11 @@  static void stm32_gpio_set_moder(struct stm32_gpio_regs *regs,
 	clrsetbits_le32(&regs->moder, mask, mode << bits_index);
 }
 
+static int stm32_gpio_get_moder(struct stm32_gpio_regs *regs, int idx)
+{
+	return (readl(&regs->moder) >> MODE_BITS(idx)) & MODE_BITS_MASK;
+}
+
 static void stm32_gpio_set_otype(struct stm32_gpio_regs *regs,
 				 int idx,
 				 enum stm32_gpio_otype otype)
@@ -51,6 +56,12 @@  static void stm32_gpio_set_otype(struct stm32_gpio_regs *regs,
 	clrsetbits_le32(&regs->otyper, OTYPE_MSK << bits, otype << bits);
 }
 
+static enum stm32_gpio_otype stm32_gpio_get_otype(struct stm32_gpio_regs *regs,
+						  int idx)
+{
+	return (readl(&regs->otyper) >> OTYPE_BITS(idx)) & OTYPE_MSK;
+}
+
 static void stm32_gpio_set_pupd(struct stm32_gpio_regs *regs,
 				int idx,
 				enum stm32_gpio_pupd pupd)
@@ -61,6 +72,12 @@  static void stm32_gpio_set_pupd(struct stm32_gpio_regs *regs,
 	clrsetbits_le32(&regs->pupdr, PUPD_MASK << bits, pupd << bits);
 }
 
+static enum stm32_gpio_pupd stm32_gpio_get_pupd(struct stm32_gpio_regs *regs,
+						int idx)
+{
+	return (readl(&regs->pupdr) >> PUPD_BITS(idx)) & PUPD_MASK;
+}
+
 /*
  * convert gpio offset to gpio index taking into account gpio holes
  * into gpio bank
@@ -202,6 +219,47 @@  static int stm32_gpio_set_dir_flags(struct udevice *dev, unsigned int offset,
 	return 0;
 }
 
+static int stm32_gpio_get_dir_flags(struct udevice *dev, unsigned int offset,
+				    ulong *flags)
+{
+	struct stm32_gpio_priv *priv = dev_get_priv(dev);
+	struct stm32_gpio_regs *regs = priv->regs;
+	int idx;
+	ulong dir_flags = 0;
+
+	idx = stm32_offset_to_index(dev, offset);
+	if (idx < 0)
+		return idx;
+
+	switch (stm32_gpio_get_moder(regs, idx)) {
+	case STM32_GPIO_MODE_OUT:
+		dir_flags |= GPIOD_IS_OUT;
+		if (stm32_gpio_get_otype(regs, idx) == STM32_GPIO_OTYPE_OD)
+			dir_flags |= GPIOD_OPEN_DRAIN;
+		if (readl(&regs->idr) & BIT(idx))
+			dir_flags |= GPIOD_IS_OUT_ACTIVE;
+		break;
+	case STM32_GPIO_MODE_IN:
+		dir_flags |= GPIOD_IS_IN;
+		switch (stm32_gpio_get_pupd(regs, idx)) {
+		case STM32_GPIO_PUPD_UP:
+			dir_flags |= GPIOD_PULL_UP;
+			break;
+		case STM32_GPIO_PUPD_DOWN:
+			dir_flags |= GPIOD_PULL_DOWN;
+			break;
+		default:
+			break;
+		}
+		break;
+	default:
+		break;
+	}
+	*flags = dir_flags;
+
+	return 0;
+}
+
 static const struct dm_gpio_ops gpio_stm32_ops = {
 	.direction_input	= stm32_gpio_direction_input,
 	.direction_output	= stm32_gpio_direction_output,
@@ -209,6 +267,7 @@  static const struct dm_gpio_ops gpio_stm32_ops = {
 	.set_value		= stm32_gpio_set_value,
 	.get_function		= stm32_gpio_get_function,
 	.set_dir_flags		= stm32_gpio_set_dir_flags,
+	.get_dir_flags		= stm32_gpio_get_dir_flags,
 };
 
 static int gpio_stm32_probe(struct udevice *dev)