From patchwork Fri Mar 22 14:55:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lartey X-Patchwork-Id: 2321241 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 31A4A3FD8C for ; Fri, 22 Mar 2013 15:01:51 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UJ3Qc-00058T-EM; Fri, 22 Mar 2013 14:58:46 +0000 Received: from slimlogic.co.uk ([89.16.172.20]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UJ3NK-0003t1-KN for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2013 14:55:30 +0000 Received: from localhost.localdomain (cpc3-sgyl22-0-0-cust168.18-2.cable.virginmedia.com [82.42.202.169]) by slimlogic.co.uk (Postfix) with ESMTPSA id 98E93130A3E; Fri, 22 Mar 2013 14:55:20 +0000 (GMT) From: Ian Lartey To: linux-kernel@vger.kernel.org Subject: [PATCH v10 08/12] gpio: Palmas palmas_gpio_(read|write|update) factoring Date: Fri, 22 Mar 2013 14:55:18 +0000 Message-Id: <1363964122-19201-9-git-send-email-ian@slimlogic.co.uk> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1363964122-19201-1-git-send-email-ian@slimlogic.co.uk> References: <1363964122-19201-1-git-send-email-ian@slimlogic.co.uk> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130322_105523_008904_15F72239 X-CRM114-Status: GOOD ( 13.00 ) X-Spam-Score: -4.4 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.5 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: linux-doc@vger.kernel.org, linus.walleij@linaro.org, grant.likely@secretlab.ca, wim@iguana.be, ldewangan@nvidia.com, gg@slimlogic.co.uk, linux-leds@vger.kernel.org, sfr@canb.auug.org.au, mturquette@linaro.org, sameo@linux.intel.com, linux-watchdog@vger.kernel.org, swarren@wwwdotorg.org, devicetree-discuss@lists.ozlabs.org, cooloney@gmail.com, rob.herring@calxeda.com, linux-arm-kernel@lists.infradead.org, j-keerthy@ti.com, broonie@opensource.wolfsonmicro.com, lgirdwood@gmail.com, t-kristo@ti.com, rpurdie@rpsys.net, rob@landley.net, akpm@linux-foundation.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org palmas_gpio_(read|write|update) gpio parameter renamed to offset palmas_gpio_write renamed to palmas_gpio_clear_and_set as it no longer takes a data value instead it always sets the offset bit and clears all other bits - Signed-off-by: Ian Lartey --- drivers/gpio/gpio-palmas.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/gpio/gpio-palmas.c b/drivers/gpio/gpio-palmas.c index 04da57a..689c633 100644 --- a/drivers/gpio/gpio-palmas.c +++ b/drivers/gpio/gpio-palmas.c @@ -32,30 +32,31 @@ struct palmas_gpio { }; static int palmas_gpio_read(struct palmas *palmas, unsigned int reg, - int gpio, unsigned int *dest) + int offset, unsigned int *dest) { /* registers for second bank are identical and offset by 0x9 */ - if (gpio > 7) + if (offset > 7) reg += PALMAS_GPIO_DATA_IN2; return palmas_read(palmas, PALMAS_GPIO_BASE, reg, dest); } -static int palmas_gpio_write(struct palmas *palmas, unsigned int reg, - int gpio, unsigned int data) +/* Note: This procedure sets 1 bit and clears _all_ others */ +static int palmas_gpio_clear_and_set(struct palmas *palmas, unsigned int reg, + int offset) { /* registers for second bank are identical and offset by 0x9 */ - if (gpio > 7) + if (offset > 7) reg += PALMAS_GPIO_DATA_IN2; - return palmas_write(palmas, PALMAS_GPIO_BASE, reg, data); + return palmas_write(palmas, PALMAS_GPIO_BASE, reg, BIT(offset % 8)); } static int palmas_gpio_update_bits(struct palmas *palmas, unsigned int reg, - int gpio, unsigned int mask, unsigned int data) + int offset, unsigned int mask, unsigned int data) { /* registers for second bank are identical and offset by 0x9 */ - if (gpio > 7) + if (offset > 7) reg += PALMAS_GPIO_DATA_IN2; return palmas_update_bits(palmas, PALMAS_GPIO_BASE, reg, mask, data); @@ -89,11 +90,11 @@ static void palmas_gpio_set(struct gpio_chip *gc, unsigned offset, int ret; if (value) - ret = palmas_gpio_write(palmas, PALMAS_GPIO_SET_DATA_OUT, - offset, BIT(offset % 8)); + ret = palmas_gpio_clear_and_set(palmas, + PALMAS_GPIO_SET_DATA_OUT, offset); else - ret = palmas_gpio_write(palmas, PALMAS_GPIO_CLEAR_DATA_OUT, - offset, BIT(offset % 8)); + ret = palmas_gpio_clear_and_set(palmas, + PALMAS_GPIO_CLEAR_DATA_OUT, offset); if (ret < 0) dev_err(gc->dev, "%s write failed, err = %d\n", (value) ? "GPIO_SET_DATA_OUT" : "GPIO_CLEAR_DATA_OUT", @@ -111,7 +112,7 @@ static int palmas_gpio_output(struct gpio_chip *gc, unsigned offset, palmas_gpio_set(gc, offset, value); ret = palmas_gpio_update_bits(palmas, PALMAS_GPIO_DATA_DIR, - offset, 1 << (offset % 8), 1 << (offset % 8)); + offset, BIT(offset % 8), BIT(offset % 8)); if (ret < 0) dev_err(gc->dev, "GPIO_DATA_DIR write failed, err = %d\n", ret); return ret; @@ -124,7 +125,7 @@ static int palmas_gpio_input(struct gpio_chip *gc, unsigned offset) int ret; ret = palmas_gpio_update_bits(palmas, PALMAS_GPIO_DATA_DIR, - offset, 1 << (offset % 8), 0); + offset, BIT(offset % 8), 0); if (ret < 0) dev_err(gc->dev, "GPIO_DATA_DIR write failed, err = %d\n", ret); return ret; @@ -149,7 +150,7 @@ static int palmas_gpio_set_debounce(struct gpio_chip *gc, unsigned offset, data = 0xff; return palmas_gpio_update_bits(palmas, PALMAS_GPIO_DEBOUNCE_EN, - offset, 1 << (offset % 8), data); + offset, BIT(offset % 8), data); } static int palmas_gpio_probe(struct platform_device *pdev) @@ -210,7 +211,6 @@ static int palmas_gpio_remove(struct platform_device *pdev) static struct of_device_id of_palmas_match_tbl[] = { { .compatible = "ti,palmas-gpio", }, - { .compatible = "ti,palmas-charger-gpio", }, { .compatible = "ti,twl6035-gpio", }, { .compatible = "ti,twl6036-gpio", }, { .compatible = "ti,twl6037-gpio", },