From patchwork Mon Apr 13 07:56:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 460711 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 5B2581402E8 for ; Mon, 13 Apr 2015 17:56:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752081AbbDMH4I (ORCPT ); Mon, 13 Apr 2015 03:56:08 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:36116 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753455AbbDMH4F (ORCPT ); Mon, 13 Apr 2015 03:56:05 -0400 Received: by pdea3 with SMTP id a3so98927976pde.3 for ; Mon, 13 Apr 2015 00:56:04 -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:content-type :mime-version:content-transfer-encoding; bh=45Krv9ac28KQXkY66gjGBfHkhQ3EJHETaejCfssBJtQ=; b=Q7DQGsdEq9WZmzlU+JXzOfVWT7YCarHwV1c2l6LWIAA2j3dBbt2MYwf2nsWRYsMC8L wnGbMCT9p5xvlRF3U7/62fGLfdZesuVWnSVeVLHXIeEwcPBO6b2fqaVtaIGPQRm6Jm/D rqIaB8BAGK2i/bVscMsogU1KFlibbbxHikISZgfKl3Yoa+aNCVRNX3SwvL/846YqbF7h 6b6WsZHbg8iwm5tlEOuylklfnhqs9K42o9CZTkyldxcUTqNu7PDiIFHTg9t2vV51o0Nh ymuwgZ1n0AlYoch93ncJCZuEDDM9ZQLKmPZSc6tdIUk4ZUiUKC87Y1N9ZwWNb70eZKAB y4VA== X-Gm-Message-State: ALoCoQklF2T7zNBysZmD+B8Ne+gPPCID+sqq4I7FYkvTN2YdNajRacmhnuxoie07JzMudJYdw7li X-Received: by 10.70.98.171 with SMTP id ej11mr24387449pdb.72.1428911764885; Mon, 13 Apr 2015 00:56:04 -0700 (PDT) Received: from [192.168.1.102] (36-230-99-56.dynamic-ip.hinet.net. [36.230.99.56]) by mx.google.com with ESMTPSA id cd10sm6421611pac.7.2015.04.13.00.56.02 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Mon, 13 Apr 2015 00:56:03 -0700 (PDT) Message-ID: <1428911760.25188.0.camel@phoenix> Subject: [PATCH v2] 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: Mon, 13 Apr 2015 15:56:00 +0800 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 Reviewed-by: Ray Jui --- v2: Make bcm_kona_gpio_get_dir explicitly return GPIOF_DIR_IN or GPIOF_DIR_OUT. drivers/gpio/gpio-bcm-kona.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c index b164ce8..a6e7922 100644 --- a/drivers/gpio/gpio-bcm-kona.c +++ b/drivers/gpio/gpio-bcm-kona.c @@ -122,6 +122,16 @@ static void bcm_kona_gpio_unlock_gpio(struct bcm_kona_gpio *kona_gpio, spin_unlock_irqrestore(&kona_gpio->lock, flags); } +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; + u32 val; + + val = readl(reg_base + GPIO_CONTROL(gpio)) & GPIO_GPCTR0_IOTR_MASK; + return val ? GPIOF_DIR_IN : GPIOF_DIR_OUT; +} + static void bcm_kona_gpio_set(struct gpio_chip *chip, unsigned gpio, int value) { struct bcm_kona_gpio *kona_gpio; @@ -135,12 +145,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); @@ -166,13 +172,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); @@ -310,6 +315,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,