From: Richard Genoud <richard.genoud@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Yegor Yefremov <yegor_sub1@visionsystems.de>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Linus Walleij <linus.walleij@linaro.org>,
Alexander Shiyan <shc_work@mail.ru>,
linux-serial@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Richard Genoud <richard.genoud@gmail.com>
Subject: [PATCH RESEND 2/5] ARM: at91: gpio: implement get_direction
Date: Tue, 13 May 2014 20:20:42 +0200 [thread overview]
Message-ID: <1400005245-11943-3-git-send-email-richard.genoud@gmail.com> (raw)
In-Reply-To: <1400005245-11943-1-git-send-email-richard.genoud@gmail.com>
This is needed for gpiod_get_direction().
Otherwise, it returns -EINVAL.
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/mach-at91/gpio.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c
index a5afcf7..afbe340 100644
--- a/arch/arm/mach-at91/gpio.c
+++ b/arch/arm/mach-at91/gpio.c
@@ -49,6 +49,7 @@ static int at91_gpiolib_request(struct gpio_chip *chip, unsigned offset);
static void at91_gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *chip);
static void at91_gpiolib_set(struct gpio_chip *chip, unsigned offset, int val);
static int at91_gpiolib_get(struct gpio_chip *chip, unsigned offset);
+static int at91_gpiolib_get_direction(struct gpio_chip *chip, unsigned offset);
static int at91_gpiolib_direction_output(struct gpio_chip *chip,
unsigned offset, int val);
static int at91_gpiolib_direction_input(struct gpio_chip *chip,
@@ -60,6 +61,7 @@ static int at91_gpiolib_to_irq(struct gpio_chip *chip, unsigned offset);
.chip = { \
.label = name, \
.request = at91_gpiolib_request, \
+ .get_direction = at91_gpiolib_get_direction, \
.direction_input = at91_gpiolib_direction_input, \
.direction_output = at91_gpiolib_direction_output, \
.get = at91_gpiolib_get, \
@@ -799,6 +801,17 @@ static int at91_gpiolib_request(struct gpio_chip *chip, unsigned offset)
return 0;
}
+static int at91_gpiolib_get_direction(struct gpio_chip *chip, unsigned offset)
+{
+ struct at91_gpio_chip *at91_gpio = to_at91_gpio_chip(chip);
+ void __iomem *pio = at91_gpio->regbase;
+ unsigned mask = 1 << offset;
+ u32 osr;
+
+ osr = __raw_readl(pio + PIO_OSR);
+ return !(osr & mask);
+}
+
static int at91_gpiolib_direction_input(struct gpio_chip *chip,
unsigned offset)
{
--
1.7.10.4
next prev parent reply other threads:[~2014-05-13 18:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-13 18:20 [PATCH RESEND 0/5] tty/serial: Add helpers to use GPIOs to control modem lines and implement atmel_serial.c Richard Genoud
2014-05-13 18:20 ` [PATCH RESEND 1/5] tty/serial: atmel_serial: Fix device tree documentation Richard Genoud
2014-05-13 18:20 ` Richard Genoud [this message]
2014-05-13 18:20 ` [PATCH RESEND 3/5] tty/serial: Add GPIOLIB helpers for controlling modem lines Richard Genoud
2014-05-20 9:26 ` Yegor Yefremov
2014-05-28 19:45 ` Greg Kroah-Hartman
2014-05-28 19:47 ` Greg Kroah-Hartman
2014-05-13 18:20 ` [PATCH RESEND 4/5] tty/serial: at91: use mctrl_gpio helpers Richard Genoud
2014-05-13 18:20 ` [PATCH RESEND 5/5] tty/serial: at91: add interrupts for modem control lines Richard Genoud
2014-08-10 19:33 ` Peter Hurley
2014-09-01 9:26 ` Richard Genoud
2014-09-02 11:40 ` Peter Hurley
2014-09-03 10:50 ` Richard Genoud
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400005245-11943-3-git-send-email-richard.genoud@gmail.com \
--to=richard.genoud@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-serial@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=shc_work@mail.ru \
--cc=yegor_sub1@visionsystems.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).