diff options
author | William Breathitt Gray <vilhelm.gray@gmail.com> | 2018-03-22 09:00:59 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2018-03-26 04:28:19 -0400 |
commit | a8ff510dbc2a4f1e17b97e35f9607c47a1df89a9 (patch) | |
tree | 63625d374b01fd2bdaee947d1a5893ab8f998c72 | |
parent | 41b251318a6359848eef98b630ed578fad2cfbe6 (diff) |
gpio: ws16c48: Implement get_multiple callback
The WinSystems WS16C48 device provides 48 lines of digital I/O accessed
via six 8-bit ports. Since eight input lines are acquired on a single
port input read, the WS16C48 GPIO driver may improve multiple input
reads by utilizing a get_multiple callback. This patch implements the
ws16c48_gpio_get_multiple function which serves as the respective
get_multiple callback.
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/gpio/gpio-ws16c48.c | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-ws16c48.c b/drivers/gpio/gpio-ws16c48.c index 746648244bf3..c7028eb0b8e1 100644 --- a/drivers/gpio/gpio-ws16c48.c +++ b/drivers/gpio/gpio-ws16c48.c | |||
@@ -11,6 +11,7 @@ | |||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | * General Public License for more details. | 12 | * General Public License for more details. |
13 | */ | 13 | */ |
14 | #include <linux/bitmap.h> | ||
14 | #include <linux/bitops.h> | 15 | #include <linux/bitops.h> |
15 | #include <linux/device.h> | 16 | #include <linux/device.h> |
16 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
@@ -129,6 +130,51 @@ static int ws16c48_gpio_get(struct gpio_chip *chip, unsigned offset) | |||
129 | return !!(port_state & mask); | 130 | return !!(port_state & mask); |
130 | } | 131 | } |
131 | 132 | ||
133 | static int ws16c48_gpio_get_multiple(struct gpio_chip *chip, | ||
134 | unsigned long *mask, unsigned long *bits) | ||
135 | { | ||
136 | struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip); | ||
137 | const unsigned int gpio_reg_size = 8; | ||
138 | size_t i; | ||
139 | const size_t num_ports = chip->ngpio / gpio_reg_size; | ||
140 | unsigned int bits_offset; | ||
141 | size_t word_index; | ||
142 | unsigned int word_offset; | ||
143 | unsigned long word_mask; | ||
144 | const unsigned long port_mask = GENMASK(gpio_reg_size - 1, 0); | ||
145 | unsigned long port_state; | ||
146 | |||
147 | /* clear bits array to a clean slate */ | ||
148 | bitmap_zero(bits, chip->ngpio); | ||
149 | |||
150 | /* get bits are evaluated a gpio port register at a time */ | ||
151 | for (i = 0; i < num_ports; i++) { | ||
152 | /* gpio offset in bits array */ | ||
153 | bits_offset = i * gpio_reg_size; | ||
154 | |||
155 | /* word index for bits array */ | ||
156 | word_index = BIT_WORD(bits_offset); | ||
157 | |||
158 | /* gpio offset within current word of bits array */ | ||
159 | word_offset = bits_offset % BITS_PER_LONG; | ||
160 | |||
161 | /* mask of get bits for current gpio within current word */ | ||
162 | word_mask = mask[word_index] & (port_mask << word_offset); | ||
163 | if (!word_mask) { | ||
164 | /* no get bits in this port so skip to next one */ | ||
165 | continue; | ||
166 | } | ||
167 | |||
168 | /* read bits from current gpio port */ | ||
169 | port_state = inb(ws16c48gpio->base + i); | ||
170 | |||
171 | /* store acquired bits at respective bits array offset */ | ||
172 | bits[word_index] |= port_state << word_offset; | ||
173 | } | ||
174 | |||
175 | return 0; | ||
176 | } | ||
177 | |||
132 | static void ws16c48_gpio_set(struct gpio_chip *chip, unsigned offset, int value) | 178 | static void ws16c48_gpio_set(struct gpio_chip *chip, unsigned offset, int value) |
133 | { | 179 | { |
134 | struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip); | 180 | struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip); |
@@ -383,6 +429,7 @@ static int ws16c48_probe(struct device *dev, unsigned int id) | |||
383 | ws16c48gpio->chip.direction_input = ws16c48_gpio_direction_input; | 429 | ws16c48gpio->chip.direction_input = ws16c48_gpio_direction_input; |
384 | ws16c48gpio->chip.direction_output = ws16c48_gpio_direction_output; | 430 | ws16c48gpio->chip.direction_output = ws16c48_gpio_direction_output; |
385 | ws16c48gpio->chip.get = ws16c48_gpio_get; | 431 | ws16c48gpio->chip.get = ws16c48_gpio_get; |
432 | ws16c48gpio->chip.get_multiple = ws16c48_gpio_get_multiple; | ||
386 | ws16c48gpio->chip.set = ws16c48_gpio_set; | 433 | ws16c48gpio->chip.set = ws16c48_gpio_set; |
387 | ws16c48gpio->chip.set_multiple = ws16c48_gpio_set_multiple; | 434 | ws16c48gpio->chip.set_multiple = ws16c48_gpio_set_multiple; |
388 | ws16c48gpio->base = base[id]; | 435 | ws16c48gpio->base = base[id]; |