diff mbox

[v2] gpio: mvebu: fix regmap_update_bits usage

Message ID 20170609100917.26660-1-gregory.clement@free-electrons.com
State New
Headers show

Commit Message

Gregory CLEMENT June 9, 2017, 10:09 a.m. UTC
In some place in the driver regmap_update_bits was misused. Indeed the
last argument is not the value of the bit (or group of bits) itself but
the mask value inside the register.

So when setting the bit N, then the value must be BIT(N) and not 1.

CC: Chris Packham <Chris.Packham@alliedtelesis.co.nz>
CC: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
Hi,

In this second version I fixed the improper changed pointed by Thomas.

Dorry for the noise,

Gregory

 drivers/gpio/gpio-mvebu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni June 9, 2017, 11:01 a.m. UTC | #1
Hello,

On Fri,  9 Jun 2017 12:09:17 +0200, Gregory CLEMENT wrote:
> In some place in the driver regmap_update_bits was misused. Indeed the
> last argument is not the value of the bit (or group of bits) itself but
> the mask value inside the register.
> 
> So when setting the bit N, then the value must be BIT(N) and not 1.
> 
> CC: Chris Packham <Chris.Packham@alliedtelesis.co.nz>
> CC: Ralph Sennhauser <ralph.sennhauser@gmail.com>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Thanks for fixing this so quickly!

Best regards,

Thomas
Ralph Sennhauser June 9, 2017, 12:21 p.m. UTC | #2
On Fri,  9 Jun 2017 12:09:17 +0200
Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:

> In some place in the driver regmap_update_bits was misused. Indeed the
> last argument is not the value of the bit (or group of bits) itself
> but the mask value inside the register.
> 
> So when setting the bit N, then the value must be BIT(N) and not 1.
> 
> CC: Chris Packham <Chris.Packham@alliedtelesis.co.nz>
> CC: Ralph Sennhauser <ralph.sennhauser@gmail.com>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---

Hi Gregory,

Tested-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>

Thanks for the prompt fix
Ralph

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Chris Packham June 11, 2017, 9:54 p.m. UTC | #3
On 10/06/17 00:22, Ralph Sennhauser wrote:
> On Fri,  9 Jun 2017 12:09:17 +0200
> Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:
> 
>> In some place in the driver regmap_update_bits was misused. Indeed the
>> last argument is not the value of the bit (or group of bits) itself
>> but the mask value inside the register.
>>
>> So when setting the bit N, then the value must be BIT(N) and not 1.
>>
>> CC: Chris Packham <Chris.Packham@alliedtelesis.co.nz>
>> CC: Ralph Sennhauser <ralph.sennhauser@gmail.com>
>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>> ---
> 
> Hi Gregory,
> 
> Tested-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
> 
> Thanks for the prompt fix
> Ralph

Also works for me

Tested-by: Chris Packham <Chris.Packham@alliedtelesis.co.nz>
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Walleij June 16, 2017, 9:16 a.m. UTC | #4
On Fri, Jun 9, 2017 at 12:09 PM, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:

> In some place in the driver regmap_update_bits was misused. Indeed the
> last argument is not the value of the bit (or group of bits) itself but
> the mask value inside the register.
>
> So when setting the bit N, then the value must be BIT(N) and not 1.
>
> CC: Chris Packham <Chris.Packham@alliedtelesis.co.nz>
> CC: Ralph Sennhauser <ralph.sennhauser@gmail.com>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---
> Hi,
>
> In this second version I fixed the improper changed pointed by Thomas.

This version applied with the tags.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
index 3d03740a20e7..877a3edffa47 100644
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@ -341,7 +341,7 @@  static int mvebu_gpio_direction_input(struct gpio_chip *chip, unsigned int pin)
 		return ret;
 
 	regmap_update_bits(mvchip->regs, GPIO_IO_CONF_OFF,
-			   BIT(pin), 1);
+			   BIT(pin), BIT(pin));
 
 	return 0;
 }
@@ -503,7 +503,7 @@  static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 	case IRQ_TYPE_EDGE_FALLING:
 	case IRQ_TYPE_LEVEL_LOW:
 		regmap_update_bits(mvchip->regs, GPIO_IN_POL_OFF,
-				   BIT(pin), 1);
+				   BIT(pin), BIT(pin));
 		break;
 	case IRQ_TYPE_EDGE_BOTH: {
 		u32 data_in, in_pol, val;