|
@@ -212,10 +212,11 @@ static int max732x_gpio_get_value(struct gpio_chip *gc, unsigned off)
|
|
|
return reg_val & (1u << (off & 0x7));
|
|
|
}
|
|
|
|
|
|
-static void max732x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val)
|
|
|
+static void max732x_gpio_set_mask(struct gpio_chip *gc, unsigned off, int mask,
|
|
|
+ int val)
|
|
|
{
|
|
|
struct max732x_chip *chip;
|
|
|
- uint8_t reg_out, mask = 1u << (off & 0x7);
|
|
|
+ uint8_t reg_out;
|
|
|
int ret;
|
|
|
|
|
|
chip = container_of(gc, struct max732x_chip, gpio_chip);
|
|
@@ -223,7 +224,7 @@ static void max732x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val)
|
|
|
mutex_lock(&chip->lock);
|
|
|
|
|
|
reg_out = (off > 7) ? chip->reg_out[1] : chip->reg_out[0];
|
|
|
- reg_out = (val) ? reg_out | mask : reg_out & ~mask;
|
|
|
+ reg_out = (reg_out & ~mask) | (val & mask);
|
|
|
|
|
|
ret = max732x_writeb(chip, is_group_a(chip, off), reg_out);
|
|
|
if (ret < 0)
|
|
@@ -238,6 +239,26 @@ out:
|
|
|
mutex_unlock(&chip->lock);
|
|
|
}
|
|
|
|
|
|
+static void max732x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val)
|
|
|
+{
|
|
|
+ unsigned base = off & ~0x7;
|
|
|
+ uint8_t mask = 1u << (off & 0x7);
|
|
|
+
|
|
|
+ max732x_gpio_set_mask(gc, base, mask, val << (off & 0x7));
|
|
|
+}
|
|
|
+
|
|
|
+static void max732x_gpio_set_multiple(struct gpio_chip *gc,
|
|
|
+ unsigned long *mask, unsigned long *bits)
|
|
|
+{
|
|
|
+ unsigned mask_lo = mask[0] & 0xff;
|
|
|
+ unsigned mask_hi = (mask[0] >> 8) & 0xff;
|
|
|
+
|
|
|
+ if (mask_lo)
|
|
|
+ max732x_gpio_set_mask(gc, 0, mask_lo, bits[0] & 0xff);
|
|
|
+ if (mask_hi)
|
|
|
+ max732x_gpio_set_mask(gc, 8, mask_hi, (bits[0] >> 8) & 0xff);
|
|
|
+}
|
|
|
+
|
|
|
static int max732x_gpio_direction_input(struct gpio_chip *gc, unsigned off)
|
|
|
{
|
|
|
struct max732x_chip *chip;
|
|
@@ -621,6 +642,7 @@ static int max732x_setup_gpio(struct max732x_chip *chip,
|
|
|
if (chip->dir_output) {
|
|
|
gc->direction_output = max732x_gpio_direction_output;
|
|
|
gc->set = max732x_gpio_set_value;
|
|
|
+ gc->set_multiple = max732x_gpio_set_multiple;
|
|
|
}
|
|
|
gc->get = max732x_gpio_get_value;
|
|
|
gc->can_sleep = true;
|