From patchwork Fri Apr 10 01:30:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 459877 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407D3140272 for ; Fri, 10 Apr 2015 11:30:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752031AbbDJBaU (ORCPT ); Thu, 9 Apr 2015 21:30:20 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:32941 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751310AbbDJBaU (ORCPT ); Thu, 9 Apr 2015 21:30:20 -0400 Received: by paboj16 with SMTP id oj16so5612063pab.0 for ; Thu, 09 Apr 2015 18:30:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-type:mime-version:content-transfer-encoding; bh=YYbaMFVghshqlcgqzRSI+y6B9jikivsZOdZp/tfoYTY=; b=cLDdpOhOKJZjptGQMliZLhfglmLRGkad3tjn1EtfgusRBFH3dFebGbbTcdQhCGGVtV DYbWKtpotBTw76v7+pCQ6YroNaI+qKwb5+7pBVzHg9Ljthm/RoSMxXSHl+fSMN1E0OjH o90u3RDG4Vp80SCdwBrHiPB8uVL0MW7YkR21VI5ecZZVUVo/Co2a4ULsdGKmnGqLNzTq KR9euJCrfgSFJ7S8JNhMekSchg66Phy0BU83PsJH9ohGCa8ow7fJN4YV+KGeBCcT3JhI aDLKbMAb9oV15MIYsc1zGU3nH+mknVp3Rr0009qrXru7+e/Vx5a3yjFalbp/d4qGQrg7 Bcgg== X-Gm-Message-State: ALoCoQmZx0JRA2eCfWDsscpLYzd/S3bymAtVbk0gbLlyfU53Wv3o0FmT4othtvX4hzMyJlpqcjld X-Received: by 10.68.168.194 with SMTP id zy2mr60618698pbb.78.1428629419593; Thu, 09 Apr 2015 18:30:19 -0700 (PDT) Received: from [192.168.0.104] (36-239-215-205.dynamic-ip.hinet.net. [36.239.215.205]) by mx.google.com with ESMTPSA id cs17sm300879pac.12.2015.04.09.18.30.16 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2015 18:30:18 -0700 (PDT) Message-ID: <1428629414.5384.2.camel@phoenix> Subject: [RFT][PATCH 2/2] gpio: bcm-kona: Implement get_direction callback From: Axel Lin To: Linus Walleij Cc: Ray Jui , Alexandre Courbot , bcm-kernel-feedback-list@broadcom.com, "linux-gpio@vger.kernel.org" Date: Fri, 10 Apr 2015 09:30:14 +0800 In-Reply-To: <1428629325.5384.1.camel@phoenix> References: <1428629325.5384.1.camel@phoenix> X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Implement gpio_chip's get_direction() callback, that lets other drivers get particular GPIOs direction using gpiod_get_direction(). Signed-off-by: Axel Lin --- drivers/gpio/gpio-bcm-kona.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c index 632352d..3649ed5 100644 --- a/drivers/gpio/gpio-bcm-kona.c +++ b/drivers/gpio/gpio-bcm-kona.c @@ -129,6 +129,14 @@ static int bcm_kona_gpio_unlock_gpio(struct bcm_kona_gpio *kona_gpio, return 0; } +static int bcm_kona_gpio_get_dir(struct gpio_chip *chip, unsigned gpio) +{ + struct bcm_kona_gpio *kona_gpio = to_kona_gpio(chip); + void __iomem *reg_base = kona_gpio->reg_base; + + return readl(reg_base + GPIO_CONTROL(gpio)) & GPIO_GPCTR0_IOTR_MASK; +} + static void bcm_kona_gpio_set(struct gpio_chip *chip, unsigned gpio, int value) { struct bcm_kona_gpio *kona_gpio; @@ -142,12 +150,8 @@ static void bcm_kona_gpio_set(struct gpio_chip *chip, unsigned gpio, int value) reg_base = kona_gpio->reg_base; spin_lock_irqsave(&kona_gpio->lock, flags); - /* determine the GPIO pin direction */ - val = readl(reg_base + GPIO_CONTROL(gpio)); - val &= GPIO_GPCTR0_IOTR_MASK; - /* this function only applies to output pin */ - if (GPIO_GPCTR0_IOTR_CMD_INPUT == val) + if (bcm_kona_gpio_get_dir(chip, gpio) == GPIOF_DIR_IN) goto out; reg_offset = value ? GPIO_OUT_SET(bank_id) : GPIO_OUT_CLEAR(bank_id); @@ -173,13 +177,12 @@ static int bcm_kona_gpio_get(struct gpio_chip *chip, unsigned gpio) reg_base = kona_gpio->reg_base; spin_lock_irqsave(&kona_gpio->lock, flags); - /* determine the GPIO pin direction */ - val = readl(reg_base + GPIO_CONTROL(gpio)); - val &= GPIO_GPCTR0_IOTR_MASK; + if (bcm_kona_gpio_get_dir(chip, gpio) == GPIOF_DIR_IN) + reg_offset = GPIO_IN_STATUS(bank_id); + else + reg_offset = GPIO_OUT_STATUS(bank_id); /* read the GPIO bank status */ - reg_offset = (GPIO_GPCTR0_IOTR_CMD_INPUT == val) ? - GPIO_IN_STATUS(bank_id) : GPIO_OUT_STATUS(bank_id); val = readl(reg_base + reg_offset); spin_unlock_irqrestore(&kona_gpio->lock, flags); @@ -316,6 +319,7 @@ static struct gpio_chip template_chip = { .owner = THIS_MODULE, .request = bcm_kona_gpio_request, .free = bcm_kona_gpio_free, + .get_direction = bcm_kona_gpio_get_dir, .direction_input = bcm_kona_gpio_direction_input, .get = bcm_kona_gpio_get, .direction_output = bcm_kona_gpio_direction_output,