From patchwork Wed Oct 17 12:31:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Stigge X-Patchwork-Id: 1605841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id A38333FD4F for ; Wed, 17 Oct 2012 12:46:36 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TOSyT-00086o-FW; Wed, 17 Oct 2012 12:43:50 +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 1TOSsc-0004Eh-NW for linux-arm-kernel@lists.infradead.org; Wed, 17 Oct 2012 12:37:49 +0000 Received: from rst-pc1.lan.work-microwave.de ([192.168.11.78]) (authenticated bits=0) by mail.work-microwave.de with ESMTP id q9HCbe4E025513 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 17 Oct 2012 13:37:41 +0100 Received: by rst-pc1.lan.work-microwave.de (Postfix, from userid 1000) id 86E98AE06B; Wed, 17 Oct 2012 14:37:40 +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 15/15 v5] gpio-ucb1400: Add block GPIO API Date: Wed, 17 Oct 2012 14:31:47 +0200 Message-Id: <1350477107-26512-16-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-ucb1400 driver. Signed-off-by: Roland Stigge --- drivers/gpio/gpio-ucb1400.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) --- linux-2.6.orig/drivers/gpio/gpio-ucb1400.c +++ linux-2.6/drivers/gpio/gpio-ucb1400.c @@ -45,6 +45,27 @@ static void ucb1400_gpio_set(struct gpio ucb1400_gpio_set_value(gpio->ac97, off, val); } +static unsigned long ucb1400_gpio_get_block(struct gpio_chip *gc, + unsigned long mask) +{ + struct ucb1400_gpio *gpio; + gpio = container_of(gc, struct ucb1400_gpio, gc); + return ucb1400_reg_read(gpio->ac97, UCB_IO_DATA) & mask; +} + +static void ucb1400_gpio_set_block(struct gpio_chip *gc, unsigned long mask, + unsigned long values) +{ + struct ucb1400_gpio *gpio; + u16 tmp; + gpio = container_of(gc, struct ucb1400_gpio, gc); + + tmp = ucb1400_reg_read(gpio->ac97, UCB_IO_DATA) & ~mask; + tmp |= values & mask; + + ucb1400_reg_write(gpio->ac97, UCB_IO_DATA, tmp); +} + static int ucb1400_gpio_probe(struct platform_device *dev) { struct ucb1400_gpio *ucb = dev->dev.platform_data; @@ -66,6 +87,8 @@ static int ucb1400_gpio_probe(struct pla ucb->gc.direction_output = ucb1400_gpio_dir_out; ucb->gc.get = ucb1400_gpio_get; ucb->gc.set = ucb1400_gpio_set; + ucb->gc.get_block = ucb1400_gpio_get_block; + ucb->gc.set_block = ucb1400_gpio_set_block; ucb->gc.can_sleep = 1; err = gpiochip_add(&ucb->gc);