* AnilKumar, Chimata <anilkumar@xxxxxx> [120906 20:27]:
> Hi Tony,
>
> On Fri, Sep 07, 2012 at 00:28:32, Tony Lindgren wrote:
> > Request pins using pinctrl framework. Only show a warning
> > on error as some boards set the pins in the bootloader
> > even if CONFIG_PINCTRL is enabled.
> >
> > Cc: linux-serial@xxxxxxxxxxxxxxx
> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> > Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
> > ---
> > arch/arm/plat-omap/include/plat/omap-serial.h | 1 +
> > drivers/tty/serial/omap-serial.c | 10 ++++++++++
> > 2 files changed, 11 insertions(+)
> >
> > diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
> > index 1a52725..0f4de14 100644
> > --- a/arch/arm/plat-omap/include/plat/omap-serial.h
> > +++ b/arch/arm/plat-omap/include/plat/omap-serial.h
> > @@ -106,6 +106,7 @@ struct uart_omap_port {
> > struct uart_port port;
> > struct uart_omap_dma uart_dma;
> > struct platform_device *pdev;
> > + struct pinctrl *pins;
> >
> > unsigned char ier;
> > unsigned char lcr;
> > diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
> > index d3cda0c..068e88c 100644
> > --- a/drivers/tty/serial/omap-serial.c
> > +++ b/drivers/tty/serial/omap-serial.c
> > @@ -39,6 +39,7 @@
> > #include <linux/irq.h>
> > #include <linux/pm_runtime.h>
> > #include <linux/of.h>
> > +#include <linux/pinctrl/consumer.h>
> >
> > #include <plat/dma.h>
> > #include <plat/dmtimer.h>
> > @@ -1492,6 +1493,13 @@ static int serial_omap_probe(struct platform_device *pdev)
> > goto err_port_line;
> > }
> >
> > + up->pins = pinctrl_get_select_default(&pdev->dev);
> > + if (IS_ERR(up->pins)) {
> > + dev_warn(&pdev->dev, "did not get pins for uart%i error: %li\n",
> > + up->port.line, PTR_ERR(up->pins));
> > + up->pins = NULL;
> > + }
> > +
> > sprintf(up->name, "OMAP UART%d", up->port.line);
> > up->port.mapbase = mem->start;
> > up->port.membase = devm_ioremap(&pdev->dev, mem->start,
> > @@ -1570,6 +1578,8 @@ static int serial_omap_remove(struct platform_device *dev)
> > pm_runtime_disable(&up->pdev->dev);
> > uart_remove_one_port(&serial_omap_reg, &up->port);
> > pm_qos_remove_request(&up->pm_qos_request);
> > + if (up->pins)
> > + pinctrl_put(up->pins);
>
> I think this can be removed if we use devm_pinctrl_get_select_default()
> above.
Yeah will do, I was initially thinking that would cause issues remuxing
pins back to safe mode on unload, but we can still do that in
serial_omap_remove().
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
