From: Sergei Shtylyov <sshtylyov@mvista.com>
To: John Crispin <blogic@openwrt.org>
Cc: Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org
Subject: Re: [PATCH V2 5/6] MIPS: lantiq: convert pci to managed gpio
Date: Fri, 24 Feb 2012 14:38:33 +0400 [thread overview]
Message-ID: <4F4768A9.5040502@mvista.com> (raw)
In-Reply-To: <1330012913-13293-5-git-send-email-blogic@openwrt.org>
Hello.
On 23-02-2012 20:01, John Crispin wrote:
> ltq_gpio_request() now uses devres to manage the gpios. We need to pass a
> struct device pointer to make it work.
> Signed-off-by: John Crispin<blogic@openwrt.org>
[...]
> diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c
> index 3bf42c8..47b5d8e 100644
> --- a/arch/mips/pci/pci-lantiq.c
> +++ b/arch/mips/pci/pci-lantiq.c
> @@ -150,24 +150,26 @@ static u32 ltq_calc_bar11mask(void)
> return bar11mask;
> }
>
> -static void ltq_pci_setup_gpio(int gpio)
> +static void ltq_pci_setup_gpio(struct device *dev)
> {
> + struct ltq_pci_data *conf = (struct ltq_pci_data *) dev->platform_data;
> int i;
> for (i = 0; i< ARRAY_SIZE(ltq_pci_gpio_map); i++) {
> - if (gpio & (1 << i)) {
> - ltq_gpio_request(ltq_pci_gpio_map[i].pin,
> + if (conf->gpio & (1 << i)) {
> + ltq_gpio_request(dev, ltq_pci_gpio_map[i].pin,
> ltq_pci_gpio_map[i].mux,
> ltq_pci_gpio_map[i].dir,
> ltq_pci_gpio_map[i].name);
> }
> }
> - ltq_gpio_request(21, 0, 1, "pci-reset");
> - ltq_pci_req_mask = (gpio>> PCI_REQ_SHIFT)& PCI_REQ_MASK;
> + ltq_gpio_request(dev, 21, 0, 1, "pci-reset");
This needs to be merged with patch 1.
WBR, Sergei
next prev parent reply other threads:[~2012-02-24 10:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-23 16:01 [PATCH V2 1/6] MIPS: lantiq: remove redunant ltq_gpio_request() declaration and add device parameter John Crispin
2012-02-23 16:01 ` [PATCH V2 2/6] MIPS: lantiq: use devm_request_gpio inside xway gpio driver John Crispin
2012-02-23 16:01 ` [PATCH V2 3/6] MIPS: lantiq: use devm_request_gpio inside falcon " John Crispin
2012-02-23 16:01 ` [PATCH V2 4/6] NET: MIPS: lantiq: convert etop to managed gpio John Crispin
2012-02-24 10:36 ` Sergei Shtylyov
2012-02-23 16:01 ` [PATCH V2 5/6] MIPS: lantiq: convert pci " John Crispin
2012-02-24 10:38 ` Sergei Shtylyov [this message]
2012-02-23 16:01 ` [PATCH V2 6/6] MIPS: lantiq: convert gpio_stp " John Crispin
2012-02-24 10:39 ` Sergei Shtylyov
2012-02-24 10:35 ` [PATCH V2 1/6] MIPS: lantiq: remove redunant ltq_gpio_request() declaration and add device parameter Sergei Shtylyov
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=4F4768A9.5040502@mvista.com \
--to=sshtylyov@mvista.com \
--cc=blogic@openwrt.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.