hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gpio: Fix bit masking in Kontron PLD GPIO driver 

This patch fixes the bit masking within the GPIO driver. The masking is
basically done twice which causes the wrong GPIOs to be addressed.

Signed-off-by: Michael Brunner <michael.brunner@kontron.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Brunner Michael 2013-07-31 20:55:39 +02:00 committed by Linus Walleij
parent 40a625daa8
commit 2e7f612264
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpio/gpio-kempld.c
View File

@ -46,9 +46,9 @@ static void kempld_gpio_bitop(struct kempld_device_data *pld,
status = kempld_read8(pld, reg); status = kempld_read8(pld, reg);
if (val) if (val)
status |= (1 << bit); status |= KEMPLD_GPIO_MASK(bit);
else else
status &= ~(1 << bit); status &= ~KEMPLD_GPIO_MASK(bit);
kempld_write8(pld, reg, status); kempld_write8(pld, reg, status);
} }
@ -60,7 +60,7 @@ static int kempld_gpio_get_bit(struct kempld_device_data *pld, u8 reg, u8 bit)
status = kempld_read8(pld, reg); status = kempld_read8(pld, reg);
kempld_release_mutex(pld); kempld_release_mutex(pld);
return !!(status & (1 << bit)); return !!(status & KEMPLD_GPIO_MASK(bit));
} }
static int kempld_gpio_get(struct gpio_chip *chip, unsigned offset) static int kempld_gpio_get(struct gpio_chip *chip, unsigned offset)
@ -69,8 +69,7 @@ static int kempld_gpio_get(struct gpio_chip *chip, unsigned offset)
= container_of(chip, struct kempld_gpio_data, chip); = container_of(chip, struct kempld_gpio_data, chip);
struct kempld_device_data *pld = gpio->pld; struct kempld_device_data *pld = gpio->pld;
return kempld_gpio_get_bit(pld, KEMPLD_GPIO_LVL_NUM(offset), return kempld_gpio_get_bit(pld, KEMPLD_GPIO_LVL_NUM(offset), offset);
KEMPLD_GPIO_MASK(offset));
} }
static void kempld_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static void kempld_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
@ -80,8 +79,7 @@ static void kempld_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
struct kempld_device_data *pld = gpio->pld; struct kempld_device_data *pld = gpio->pld;
kempld_get_mutex(pld); kempld_get_mutex(pld);
kempld_gpio_bitop(pld, KEMPLD_GPIO_LVL_NUM(offset), kempld_gpio_bitop(pld, KEMPLD_GPIO_LVL_NUM(offset), offset, value);
KEMPLD_GPIO_MASK(offset), value);
kempld_release_mutex(pld); kempld_release_mutex(pld);
} }
@ -92,8 +90,7 @@ static int kempld_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
struct kempld_device_data *pld = gpio->pld; struct kempld_device_data *pld = gpio->pld;
kempld_get_mutex(pld); kempld_get_mutex(pld);
kempld_gpio_bitop(pld, KEMPLD_GPIO_DIR_NUM(offset), kempld_gpio_bitop(pld, KEMPLD_GPIO_DIR_NUM(offset), offset, 0);
KEMPLD_GPIO_MASK(offset), 0);
kempld_release_mutex(pld); kempld_release_mutex(pld);
return 0; return 0;
@ -107,10 +104,8 @@ static int kempld_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
struct kempld_device_data *pld = gpio->pld; struct kempld_device_data *pld = gpio->pld;
kempld_get_mutex(pld); kempld_get_mutex(pld);
kempld_gpio_bitop(pld, KEMPLD_GPIO_LVL_NUM(offset), kempld_gpio_bitop(pld, KEMPLD_GPIO_LVL_NUM(offset), offset, value);
KEMPLD_GPIO_MASK(offset), value); kempld_gpio_bitop(pld, KEMPLD_GPIO_DIR_NUM(offset), offset, 1);
kempld_gpio_bitop(pld, KEMPLD_GPIO_DIR_NUM(offset),
KEMPLD_GPIO_MASK(offset), 1);
kempld_release_mutex(pld); kempld_release_mutex(pld);
return 0; return 0;
@ -122,8 +117,7 @@ static int kempld_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
= container_of(chip, struct kempld_gpio_data, chip); = container_of(chip, struct kempld_gpio_data, chip);
struct kempld_device_data *pld = gpio->pld; struct kempld_device_data *pld = gpio->pld;
return kempld_gpio_get_bit(pld, KEMPLD_GPIO_DIR_NUM(offset), return kempld_gpio_get_bit(pld, KEMPLD_GPIO_DIR_NUM(offset), offset);
KEMPLD_GPIO_MASK(offset));
} }
static int kempld_gpio_pincount(struct kempld_device_data *pld) static int kempld_gpio_pincount(struct kempld_device_data *pld)