From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/9] serial: amba-pl011: adopt pinctrl support
Date: Sun, 6 May 2012 16:41:56 +0100 [thread overview]
Message-ID: <20120506154156.GS897@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1336318505-27043-3-git-send-email-shawn.guo@linaro.org>
On Sun, May 06, 2012 at 11:34:58PM +0800, Shawn Guo wrote:
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Looks fine.
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
> ---
> drivers/tty/serial/amba-pl011.c | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
> index 3d569cd..062ef8c 100644
> --- a/drivers/tty/serial/amba-pl011.c
> +++ b/drivers/tty/serial/amba-pl011.c
> @@ -52,6 +52,7 @@
> #include <linux/scatterlist.h>
> #include <linux/delay.h>
> #include <linux/types.h>
> +#include <linux/pinctrl/consumer.h>
>
> #include <asm/io.h>
> #include <asm/sizes.h>
> @@ -1916,6 +1917,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
> {
> struct uart_amba_port *uap;
> struct vendor_data *vendor = id->data;
> + struct pinctrl *pinctrl;
> void __iomem *base;
> int i, ret;
>
> @@ -1940,6 +1942,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
> goto free;
> }
>
> + pinctrl = devm_pinctrl_get_select_default(&dev->dev);
> + if (IS_ERR(pinctrl)) {
> + ret = PTR_ERR(pinctrl);
> + goto unmap;
> + }
> +
> uap->clk = clk_get(&dev->dev, NULL);
> if (IS_ERR(uap->clk)) {
> ret = PTR_ERR(uap->clk);
> --
> 1.7.5.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2012-05-06 15:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-06 15:34 [PATCH 0/9] Enable pinctrl support for mach-mxs Shawn Guo
2012-05-06 15:34 ` [PATCH 1/9] ARM: mxs: enable pinctrl dummy states Shawn Guo
2012-05-06 15:34 ` [PATCH 2/9] serial: amba-pl011: adopt pinctrl support Shawn Guo
2012-05-06 15:41 ` Russell King - ARM Linux [this message]
2012-05-21 18:53 ` Linus Walleij
2012-05-06 15:34 ` [PATCH 3/9] serial: mxs-auart: " Shawn Guo
2012-05-06 15:35 ` [PATCH 4/9] mmc: mxs-mmc: " Shawn Guo
2012-05-06 16:09 ` Chris Ball
2012-05-07 1:08 ` Shawn Guo
2012-05-06 15:35 ` [PATCH 5/9] mtd: nand: gpmi: " Shawn Guo
2012-05-06 15:35 ` [PATCH 6/9] i2c: mxs: " Shawn Guo
2012-05-06 15:35 ` [PATCH 7/9] ASoC: mxs-saif: " Shawn Guo
2012-05-06 15:35 ` [PATCH 8/9] video: mxsfb: " Shawn Guo
2012-05-06 15:35 ` [PATCH 9/9] ARM: mxs: enable " Shawn Guo
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=20120506154156.GS897@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--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).