@@ -171,6 +171,46 @@ static int gpiomm_gpio_get(struct gpio_chip *chip, unsigned int offset)
return !!(port_state & mask);
}
+static int gpiomm_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,
+ unsigned long *bits)
+{
+ struct gpiomm_gpio *const gpiommgpio = gpiochip_get_data(chip);
+ unsigned int i;
+ const unsigned int gpio_reg_size = 8;
+ unsigned int bit_word_offset;
+ unsigned int bits_mask;
+ const unsigned long reg_mask = GENMASK(gpio_reg_size, 0);
+ unsigned int port;
+ unsigned int in_port;
+ unsigned long port_state;
+
+ /* clear bits array to a clean slate */
+ for (i = 0; i < chip->ngpio; i += BITS_PER_LONG)
+ bits[i / BITS_PER_LONG] = 0;
+
+ /* get bits are evaluated a gpio register size at a time */
+ for (i = 0; i < chip->ngpio; i += gpio_reg_size) {
+ bit_word_offset = i % BITS_PER_LONG;
+ bits_mask = mask[BIT_WORD(i)] & (reg_mask << bit_word_offset);
+ if (!bits_mask) {
+ /* no get bits in this register so skip to next one */
+ continue;
+ }
+
+ /* compute input port offset */
+ port = i / gpio_reg_size;
+ in_port = (port > 2) ? port + 1 : port;
+
+ /* get input bits */
+ port_state = inb(gpiommgpio->base + in_port);
+
+ /* store acquired bits */
+ bits[BIT_WORD(i)] |= port_state << bit_word_offset;
+ }
+
+ return 0;
+}
+
static void gpiomm_gpio_set(struct gpio_chip *chip, unsigned int offset,
int value)
{
@@ -268,6 +308,7 @@ static int gpiomm_probe(struct device *dev, unsigned int id)
gpiommgpio->chip.direction_input = gpiomm_gpio_direction_input;
gpiommgpio->chip.direction_output = gpiomm_gpio_direction_output;
gpiommgpio->chip.get = gpiomm_gpio_get;
+ gpiommgpio->chip.get_multiple = gpiomm_gpio_get_multiple;
gpiommgpio->chip.set = gpiomm_gpio_set;
gpiommgpio->chip.set_multiple = gpiomm_gpio_set_multiple;
gpiommgpio->base = base[id];
The Diamond Systems GPIO-MM series of devices contain two 82C55A devices, which each feature three 8-bit ports of I/O. Since eight input lines are acquired on a single port input read, the GPIO-MM GPIO driver may improve multiple input reads by utilizing a get_multiple callback. This patch implements the gpiomm_gpio_get_multiple function which serves as the respective get_multiple callback. Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> --- drivers/gpio/gpio-gpio-mm.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)