From: eric.y.miao@gmail.com (Eric Miao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/11] UCB1400: Pass ucb1400-gpio data through ac97 bus
Date: Mon, 20 Sep 2010 22:45:59 +0800 [thread overview]
Message-ID: <AANLkTimpAV3ukE08kBoT9w3S5LFtWuiPA1HbKxt3gsM8@mail.gmail.com> (raw)
In-Reply-To: <1284604382-23683-8-git-send-email-marek.vasut@gmail.com>
Cc'ed David.
David,
Do you mind it goes through my tree as there is subsequent patches
following that have dependency? In that case, your Ack is mostly
welcome.
On Thu, Sep 16, 2010 at 10:32 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
> ?drivers/gpio/ucb1400_gpio.c | ? 19 ++++++-------------
> ?drivers/mfd/ucb1400_core.c ?| ? ?5 +++++
> ?include/linux/ucb1400.h ? ? | ? 19 ++++++-------------
> ?3 files changed, 17 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/gpio/ucb1400_gpio.c b/drivers/gpio/ucb1400_gpio.c
> index 50e6bd1..fba45a5 100644
> --- a/drivers/gpio/ucb1400_gpio.c
> +++ b/drivers/gpio/ucb1400_gpio.c
> @@ -12,8 +12,6 @@
> ?#include <linux/module.h>
> ?#include <linux/ucb1400.h>
>
> -struct ucb1400_gpio_data *ucbdata;
> -
> ?static int ucb1400_gpio_dir_in(struct gpio_chip *gc, unsigned off)
> ?{
> ? ? ? ?struct ucb1400_gpio *gpio;
> @@ -50,7 +48,7 @@ static int ucb1400_gpio_probe(struct platform_device *dev)
> ? ? ? ?struct ucb1400_gpio *ucb = dev->dev.platform_data;
> ? ? ? ?int err = 0;
>
> - ? ? ? if (!(ucbdata && ucbdata->gpio_offset)) {
> + ? ? ? if (!(ucb && ucb->gpio_offset)) {
> ? ? ? ? ? ? ? ?err = -EINVAL;
> ? ? ? ? ? ? ? ?goto err;
> ? ? ? ?}
> @@ -58,7 +56,7 @@ static int ucb1400_gpio_probe(struct platform_device *dev)
> ? ? ? ?platform_set_drvdata(dev, ucb);
>
> ? ? ? ?ucb->gc.label = "ucb1400_gpio";
> - ? ? ? ucb->gc.base = ucbdata->gpio_offset;
> + ? ? ? ucb->gc.base = ucb->gpio_offset;
> ? ? ? ?ucb->gc.ngpio = 10;
> ? ? ? ?ucb->gc.owner = THIS_MODULE;
>
> @@ -72,8 +70,8 @@ static int ucb1400_gpio_probe(struct platform_device *dev)
> ? ? ? ?if (err)
> ? ? ? ? ? ? ? ?goto err;
>
> - ? ? ? if (ucbdata && ucbdata->gpio_setup)
> - ? ? ? ? ? ? ? err = ucbdata->gpio_setup(&dev->dev, ucb->gc.ngpio);
> + ? ? ? if (ucb && ucb->gpio_setup)
> + ? ? ? ? ? ? ? err = ucb->gpio_setup(&dev->dev, ucb->gc.ngpio);
>
> ?err:
> ? ? ? ?return err;
> @@ -85,8 +83,8 @@ static int ucb1400_gpio_remove(struct platform_device *dev)
> ? ? ? ?int err = 0;
> ? ? ? ?struct ucb1400_gpio *ucb = platform_get_drvdata(dev);
>
> - ? ? ? if (ucbdata && ucbdata->gpio_teardown) {
> - ? ? ? ? ? ? ? err = ucbdata->gpio_teardown(&dev->dev, ucb->gc.ngpio);
> + ? ? ? if (ucb && ucb->gpio_teardown) {
> + ? ? ? ? ? ? ? err = ucb->gpio_teardown(&dev->dev, ucb->gc.ngpio);
> ? ? ? ? ? ? ? ?if (err)
> ? ? ? ? ? ? ? ? ? ? ? ?return err;
> ? ? ? ?}
> @@ -113,11 +111,6 @@ static void __exit ucb1400_gpio_exit(void)
> ? ? ? ?platform_driver_unregister(&ucb1400_gpio_driver);
> ?}
>
> -void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data)
> -{
> - ? ? ? ucbdata = data;
> -}
> -
> ?module_init(ucb1400_gpio_init);
> ?module_exit(ucb1400_gpio_exit);
>
> diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c
> index d73f84b..63f4969 100644
> --- a/drivers/mfd/ucb1400_core.c
> +++ b/drivers/mfd/ucb1400_core.c
> @@ -75,6 +75,11 @@ static int ucb1400_core_probe(struct device *dev)
>
> ? ? ? ?/* GPIO */
> ? ? ? ?ucb_gpio.ac97 = ac97;
> + ? ? ? if (pdata) {
> + ? ? ? ? ? ? ? ucb_gpio.gpio_setup = pdata->gpio_setup;
> + ? ? ? ? ? ? ? ucb_gpio.gpio_teardown = pdata->gpio_teardown;
> + ? ? ? ? ? ? ? ucb_gpio.gpio_offset = pdata->gpio_offset;
> + ? ? ? }
> ? ? ? ?ucb->ucb1400_gpio = platform_device_alloc("ucb1400_gpio", -1);
> ? ? ? ?if (!ucb->ucb1400_gpio) {
> ? ? ? ? ? ? ? ?err = -ENOMEM;
> diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h
> index 1b47909..1a6bfdd 100644
> --- a/include/linux/ucb1400.h
> +++ b/include/linux/ucb1400.h
> @@ -83,15 +83,12 @@
> ?#define UCB_ID ? ? ? ? ? ? ? ? 0x7e
> ?#define UCB_ID_1400 ? ? ? ? ? ? 0x4304
>
> -struct ucb1400_gpio_data {
> - ? ? ? int gpio_offset;
> - ? ? ? int (*gpio_setup)(struct device *dev, int ngpio);
> - ? ? ? int (*gpio_teardown)(struct device *dev, int ngpio);
> -};
> -
> ?struct ucb1400_gpio {
> ? ? ? ?struct gpio_chip ? ? ? ?gc;
> ? ? ? ?struct snd_ac97 ? ? ? ? *ac97;
> + ? ? ? int ? ? ? ? ? ? ? ? ? ? gpio_offset;
> + ? ? ? int (*gpio_setup)(struct device *dev, int ngpio);
> + ? ? ? int (*gpio_teardown)(struct device *dev, int ngpio);
> ?};
>
> ?struct ucb1400_ts {
> @@ -112,6 +109,9 @@ struct ucb1400 {
>
> ?struct ucb1400_pdata {
> ? ? ? ?int ? ? irq;
> + ? ? ? int ? ? gpio_offset;
> + ? ? ? int (*gpio_setup)(struct device *dev, int ngpio);
> + ? ? ? int (*gpio_teardown)(struct device *dev, int ngpio);
> ?};
>
> ?static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg)
> @@ -163,11 +163,4 @@ static inline void ucb1400_adc_disable(struct snd_ac97 *ac97)
>
> ?unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel,
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?int adcsync);
> -
> -#ifdef CONFIG_GPIO_UCB1400
> -void __init ucb1400_gpio_set_data(struct ucb1400_gpio_data *data);
> -#else
> -static inline void ucb1400_gpio_set_data(struct ucb1400_gpio_data *data) {}
> -#endif
> -
> ?#endif
> --
> 1.7.1
>
>
next prev parent reply other threads:[~2010-09-20 14:45 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-16 2:32 [PATCH 01/11] ARM: pxa: Prepare pxa2xx pcmcia for pxa320 Marek Vasut
2010-09-16 2:32 ` [PATCH 02/11] ARM: pxa: Toradex Colibri PXA270 CF support Marek Vasut
2010-09-20 14:16 ` Eric Miao
2010-09-20 14:21 ` Eric Miao
2010-09-21 21:56 ` Marek Vasut
2010-09-16 2:32 ` [PATCH 03/11] ARM: pxa: Push Colibri evalboard MFP into module files Marek Vasut
2010-09-20 14:29 ` Eric Miao
2010-09-21 21:55 ` Marek Vasut
2010-09-16 2:32 ` [PATCH 04/11] ARM: pxa: Add M41T00 RTC support into Colibri evalboard Marek Vasut
2010-09-20 14:40 ` Eric Miao
2010-09-16 2:32 ` [PATCH 05/11] ARM: pxa: Rename " Marek Vasut
2010-09-20 14:41 ` Eric Miao
2010-09-21 21:53 ` Marek Vasut
2010-09-16 2:32 ` [PATCH 06/11] ARM: pxa: Colibri PXA320 PCMCIA driver Marek Vasut
2010-09-20 14:43 ` Eric Miao
2010-09-21 21:52 ` Marek Vasut
2010-09-16 2:32 ` [PATCH 07/11] ARM: pxa: Modularize Palm Tungsten|C Marek Vasut
2010-09-20 14:44 ` Eric Miao
2010-09-16 2:32 ` [PATCH 08/11] UCB1400: Pass ucb1400-gpio data through ac97 bus Marek Vasut
2010-09-20 14:45 ` Eric Miao [this message]
2010-10-01 0:15 ` Marek Vasut
2010-09-16 2:33 ` [PATCH 09/11] ARM: pxa: Correct touch IRQ passing to UCB1400 on vpac270 Marek Vasut
2010-09-20 14:46 ` Eric Miao
2010-09-16 2:33 ` [PATCH 10/11] ARM: pxa: Pass GPIO offset to ucb1400-gpio on PalmTC Marek Vasut
2010-09-20 14:47 ` Eric Miao
2010-09-16 2:33 ` [PATCH 11/11] ARM: pxa: Add gpio-leds and vibrator support to PalmTC Marek Vasut
2010-09-20 14:47 ` Eric Miao
2010-09-20 14:14 ` [PATCH 01/11] ARM: pxa: Prepare pxa2xx pcmcia for pxa320 Eric Miao
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=AANLkTimpAV3ukE08kBoT9w3S5LFtWuiPA1HbKxt3gsM8@mail.gmail.com \
--to=eric.y.miao@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).