| Message ID | 1358544639-14761-7-git-send-email-maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jan 18, 2013 at 10:30 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Use pinctrl to configure the SoCs pins directly from the driver. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> You can poke Greg about this which is fun because it does become superfluous with the patch titled "[PATCH v4] drivers/pinctrl: grab default handles from device core" http://marc.info/?l=linux-kernel&m=135879594515932&w=2 Which will auto-grab the default state on any device. Greg, can I have your ACK on that device core grab patch so you don't have to merge this patch but can point out that it solves the boilerplate problem? Yours, Linus Walleij
On Mon, Jan 21, 2013 at 11:13:55PM +0100, Linus Walleij wrote: > On Fri, Jan 18, 2013 at 10:30 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > > Use pinctrl to configure the SoCs pins directly from the driver. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > You can poke Greg about this which is fun because it does become > superfluous with the patch titled > "[PATCH v4] drivers/pinctrl: grab default handles from device core" > http://marc.info/?l=linux-kernel&m=135879594515932&w=2 > > Which will auto-grab the default state on any device. > > Greg, can I have your ACK on that device core grab patch > so you don't have to merge this patch but can point out that > it solves the boilerplate problem? Yes you now do. greg k-h
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index e7cae1c..e9f3289 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/delay.h> +#include <linux/pinctrl/consumer.h> #include <linux/serial_core.h> #include <linux/serial_8250.h> #include <linux/serial_reg.h> @@ -57,6 +58,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev, struct of_serial_info *info) { struct resource resource; + struct pinctrl *pinctrl; struct device_node *np = ofdev->dev.of_node; u32 clk, spd, prop; int ret; @@ -85,6 +87,11 @@ static int of_platform_serial_setup(struct platform_device *ofdev, goto out; } + pinctrl = devm_pinctrl_get_select_default(&ofdev->dev); + if (IS_ERR(pinctrl)) + dev_warn(&ofdev->dev, + "pins are not configured from the driver\n"); + spin_lock_init(&port->lock); port->mapbase = resource.start;
Use pinctrl to configure the SoCs pins directly from the driver. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/tty/serial/of_serial.c | 7 +++++++ 1 file changed, 7 insertions(+)