From patchwork Sat Mar 17 15:52:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Breathitt Gray X-Patchwork-Id: 10290903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0AFF960385 for ; Sat, 17 Mar 2018 15:52:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F289E28E90 for ; Sat, 17 Mar 2018 15:52:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6ED128F77; Sat, 17 Mar 2018 15:52:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F6B728E90 for ; Sat, 17 Mar 2018 15:52:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753674AbeCQPwP (ORCPT ); Sat, 17 Mar 2018 11:52:15 -0400 Received: from mail-yw0-f194.google.com ([209.85.161.194]:44643 "EHLO mail-yw0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753670AbeCQPwO (ORCPT ); Sat, 17 Mar 2018 11:52:14 -0400 Received: by mail-yw0-f194.google.com with SMTP id x197so8905691ywg.11; Sat, 17 Mar 2018 08:52:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2aOBwAY9mlj+M55IsQWFERppuRK4GrWm0nLOt1lB5nU=; b=WYZR6K21xO0/MoJtEFMgpPjPgWHIbTCyuG5c6dfSiYwXw5iFVbdr9BZTp6CePSWoLa J7fncBUNrpW8s7tuFIQOPT1OtLwqkIGGbUcq9wXlYztF7EVrl3f1+eSQiapXBT8A6P72 d+yGcTI3HKbJ3yuD0ESbBMPZACf/vdQ28NSKk7cNfiSGcVv6mXoTSNlKKZ+VJ7fR4wGZ 6qOc0XOUYCFnxahc5OWqvj1uCEV85mwZ6Z4i2kZNTR3STdeLTQdEpfs99pBub2r2jTIG ZL26qMc1aZOf8nES1m0lsno7bVTa2lJQbz6DfjBqvopBe9ohOs6suxiPiscMUXazoPLn /4dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2aOBwAY9mlj+M55IsQWFERppuRK4GrWm0nLOt1lB5nU=; b=nTakCJcYd+m5NAgUIBnShMayH13LOF8RtuJHg0TnO2xo5dQ/dYV/+pNfXFP9hLCRtV dNgnoCnvke909e0RqFfciyXnZWao1JXPav3WsgNGhZ9NRPWaatKIIB4YJti88YFSbu0G fYnPCwwxbQa8SVKWVX3j+ux8oZuxAPqlALwis3oL6WAxxbdSPlcGcttgaKhXALMhiC8R P54HuN73XTRtvgii7t2+Gk5rEl5R2RXK0CxE3nADvW0uP9gFffuwQm9UYwxWibATN0DS qXorvepdpMLzuaFulwwQG4945d/eZVS3IuD/1T/hV8vxa37hqcEk8zK4SK1XSuxVpG6A CWDQ== X-Gm-Message-State: AElRT7HwNxZq+Ds0qrwA681x7WJiJ4W2OfJuyuu/09dov+93wAPiGVGA gLq29fpv/VXwJgh8HnAwuKM= X-Google-Smtp-Source: AG47ELsmSTQrUbF+AaPskc/pHX7ZaTRIgdQ9FwhfMCPAmUtpu4kDa/DRacLM9JvFCvFiiWRp6SNSKA== X-Received: by 10.129.161.2 with SMTP id y2mr3514127ywg.267.1521301933830; Sat, 17 Mar 2018 08:52:13 -0700 (PDT) Received: from localhost ([72.188.97.40]) by smtp.gmail.com with ESMTPSA id n16sm3630283ywh.88.2018.03.17.08.52.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Mar 2018 08:52:13 -0700 (PDT) From: William Breathitt Gray To: linus.walleij@linaro.org Cc: andy.shevchenko@gmail.com, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, William Breathitt Gray Subject: [PATCH v3 8/8] gpio: ws16c48: Implement get_multiple callback Date: Sat, 17 Mar 2018 11:52:01 -0400 Message-Id: <6fce3d38ec4ea09923780db68de6e0091b7c7bdf.1521301345.git.vilhelm.gray@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: References: Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/gpio/gpio-ws16c48.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/drivers/gpio/gpio-ws16c48.c b/drivers/gpio/gpio-ws16c48.c index 746648244bf3..10525367aa6f 100644 --- a/drivers/gpio/gpio-ws16c48.c +++ b/drivers/gpio/gpio-ws16c48.c @@ -11,6 +11,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. */ +#include #include #include #include @@ -129,6 +130,51 @@ static int ws16c48_gpio_get(struct gpio_chip *chip, unsigned offset) return !!(port_state & mask); } +static int ws16c48_gpio_get_multiple(struct gpio_chip *chip, + unsigned long *mask, unsigned long *bits) +{ + struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip); + const unsigned int gpio_reg_size = 8; + size_t i; + const size_t num_ports = chip->ngpio / gpio_reg_size; + unsigned int bits_offset; + size_t word_index; + unsigned int word_offset; + unsigned long word_mask; + const unsigned long port_mask = GENMASK(gpio_reg_size, 0); + unsigned long port_state; + + /* clear bits array to a clean slate */ + bitmap_zero(bits, chip->ngpio); + + /* get bits are evaluated a gpio port register at a time */ + for (i = 0; i < num_ports; i++) { + /* gpio offset in bits array */ + bits_offset = i * gpio_reg_size; + + /* word index for bits array */ + word_index = BIT_WORD(bits_offset); + + /* gpio offset within current word of bits array */ + word_offset = bits_offset % BITS_PER_LONG; + + /* mask of get bits for current gpio within current word */ + word_mask = mask[word_index] & (port_mask << word_offset); + if (!word_mask) { + /* no get bits in this port so skip to next one */ + continue; + } + + /* read bits from current gpio port */ + port_state = inb(ws16c48gpio->base + i); + + /* store acquired bits at respective bits array offset */ + bits[word_index] |= port_state << word_offset; + } + + return 0; +} + static void ws16c48_gpio_set(struct gpio_chip *chip, unsigned offset, int value) { struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip); @@ -383,6 +429,7 @@ static int ws16c48_probe(struct device *dev, unsigned int id) ws16c48gpio->chip.direction_input = ws16c48_gpio_direction_input; ws16c48gpio->chip.direction_output = ws16c48_gpio_direction_output; ws16c48gpio->chip.get = ws16c48_gpio_get; + ws16c48gpio->chip.get_multiple = ws16c48_gpio_get_multiple; ws16c48gpio->chip.set = ws16c48_gpio_set; ws16c48gpio->chip.set_multiple = ws16c48_gpio_set_multiple; ws16c48gpio->base = base[id];