public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Jean-François Dagenais" <jeff.dagenais@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: michael.hennerich@analog.com, grant.likely@secretlab.ca,
	"Jean-François Dagenais" <jeff.dagenais@gmail.com>
Subject: [PATCH 1/2] input: adp5588 - add support for gpio names
Date: Mon,  9 Jan 2012 11:50:19 -0500	[thread overview]
Message-ID: <1326127820-29682-1-git-send-email-jeff.dagenais@gmail.com> (raw)
In-Reply-To: <1326121523-28634-2-git-send-email-jeff.dagenais@gmail.com>


Signed-off-by: Jean-François Dagenais <jeff.dagenais@gmail.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
---
 drivers/input/keyboard/adp5588-keys.c |    1 +
 include/linux/i2c/adp5588.h           |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index e34eeb8..6412ced 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -197,6 +197,7 @@ static int __devinit adp5588_gpio_add(struct adp5588_kpad *kpad)
 	kpad->gc.base = gpio_data->gpio_start;
 	kpad->gc.label = kpad->client->name;
 	kpad->gc.owner = THIS_MODULE;
+	kpad->gc.names = gpio_data->names;
 
 	mutex_init(&kpad->gpio_lock);
 
diff --git a/include/linux/i2c/adp5588.h b/include/linux/i2c/adp5588.h
index cec17cf..d8341cb 100644
--- a/include/linux/i2c/adp5588.h
+++ b/include/linux/i2c/adp5588.h
@@ -157,6 +157,7 @@ struct i2c_client; /* forward declaration */
 
 struct adp5588_gpio_platform_data {
 	int gpio_start;		/* GPIO Chip base # */
+	const char *const *names;
 	unsigned irq_base;	/* interrupt base # */
 	unsigned pullup_dis_mask; /* Pull-Up Disable Mask */
 	int	(*setup)(struct i2c_client *client,
-- 
1.7.8.2


  parent reply	other threads:[~2012-01-09 16:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-09 15:05 [PATCH 1/2] input: adp5588-keys - get value from data out when dir out Jean-François Dagenais
2012-01-09 15:05 ` [PATCH 2/2] gpio: adp5588 " Jean-François Dagenais
2012-01-09 16:37   ` [RESEND PATCH " Jean-François Dagenais
2012-01-09 16:50   ` Jean-François Dagenais [this message]
2012-01-09 19:16     ` [PATCH 1/2] input: adp5588 - add support for gpio names Jean-Francois Dagenais

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=1326127820-29682-1-git-send-email-jeff.dagenais@gmail.com \
    --to=jeff.dagenais@gmail.com \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael.hennerich@analog.com \
    /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