From patchwork Wed Oct 17 12:31:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Stigge X-Patchwork-Id: 1605821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 47CF7DFABE for ; Wed, 17 Oct 2012 12:46:00 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TOSxf-0007SI-7E; Wed, 17 Oct 2012 12:42:59 +0000 Received: from mail.work-microwave.de ([62.245.205.51] helo=work-microwave.de) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TOSsa-0004DS-1I for linux-arm-kernel@lists.infradead.org; Wed, 17 Oct 2012 12:37:45 +0000 Received: from rst-pc1.lan.work-microwave.de ([192.168.11.78]) (authenticated bits=0) by mail.work-microwave.de with ESMTP id q9HCbaeB025507 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 17 Oct 2012 13:37:37 +0100 Received: by rst-pc1.lan.work-microwave.de (Postfix, from userid 1000) id 8AEA4AE06B; Wed, 17 Oct 2012 14:37:36 +0200 (CEST) From: Roland Stigge To: gregkh@linuxfoundation.org, grant.likely@secretlab.ca, linus.walleij@linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, w.sang@pengutronix.de, jbe@pengutronix.de, plagnioj@jcrosoft.com, highguy@gmail.com, broonie@opensource.wolfsonmicro.com, daniel-gl@gmx.net, rmallon@gmail.com Subject: [PATCH RFC 13/15 v5] gpio-xilinx: Add block GPIO API Date: Wed, 17 Oct 2012 14:31:45 +0200 Message-Id: <1350477107-26512-14-git-send-email-stigge@antcom.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350477107-26512-1-git-send-email-stigge@antcom.de> References: <1350477107-26512-1-git-send-email-stigge@antcom.de> X-FEAS-SYSTEM-WL: rst@work-microwave.de, 192.168.11.78 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Roland Stigge X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch adds block GPIO API support to the gpio-xilinx driver. Signed-off-by: Roland Stigge --- drivers/gpio/gpio-xilinx.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) --- linux-2.6.orig/drivers/gpio/gpio-xilinx.c +++ linux-2.6/drivers/gpio/gpio-xilinx.c @@ -49,6 +49,21 @@ static int xgpio_get(struct gpio_chip *g } /** + * xgpio_get_block - Read a block of specified signals of the GPIO device. + * @gc: Pointer to gpio_chip device structure. + * @mask: Bit mask (bit 0 == 0th GPIO) for GPIOs to get + * + * This function reads a block of specified signal of the GPIO device, returned + * as a bit mask, each bit representing a GPIO + */ +static unsigned long xgpio_get_block(struct gpio_chip *gc, unsigned long mask) +{ + struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); + + return in_be32(mm_gc->regs + XGPIO_DATA_OFFSET) & mask; +} + +/** * xgpio_set - Write the specified signal of the GPIO device. * @gc: Pointer to gpio_chip device structure. * @gpio: GPIO signal number. @@ -77,6 +92,33 @@ static void xgpio_set(struct gpio_chip * } /** + * xgpio_set_block - Write a block of specified signals of the GPIO device. + * @gc: Pointer to gpio_chip device structure. + * @mask: Bit mask (bit 0 == 0th GPIO) for GPIOs to set + * @values: Bit mapped values + * + * This function writes the specified values in to the specified signals of the + * GPIO device. + */ +static void xgpio_set_block(struct gpio_chip *gc, unsigned long mask, + unsigned long values) +{ + unsigned long flags; + struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); + struct xgpio_instance *chip = + container_of(mm_gc, struct xgpio_instance, mmchip); + + spin_lock_irqsave(&chip->gpio_lock, flags); + + chip->gpio_state &= ~mask; + chip->gpio_state |= mask & values; + + out_be32(mm_gc->regs + XGPIO_DATA_OFFSET, chip->gpio_state); + + spin_unlock_irqrestore(&chip->gpio_lock, flags); +} + +/** * xgpio_dir_in - Set the direction of the specified GPIO signal as input. * @gc: Pointer to gpio_chip device structure. * @gpio: GPIO signal number. @@ -195,6 +237,8 @@ static int __devinit xgpio_of_probe(stru chip->mmchip.gc.direction_output = xgpio_dir_out; chip->mmchip.gc.get = xgpio_get; chip->mmchip.gc.set = xgpio_set; + chip->mmchip.gc.get_block = xgpio_get_block; + chip->mmchip.gc.set_block = xgpio_set_block; chip->mmchip.save_regs = xgpio_save_regs;