On Sun, Jul 03, 2011 at 03:56:00PM +0800, Shawn Guo wrote: > It adds device tree probe support for imx tty/serial driver. > > Signed-off-by: Jeremy Kerr <jeremy.kerr@xxxxxxxxxxxxx> > Signed-off-by: Jason Liu <jason.hui@xxxxxxxxxx> > Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxx> > Cc: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> > Cc: Grant Likely <grant.likely@xxxxxxxxxxxx> > --- > .../bindings/tty/serial/fsl-imx-uart.txt | 19 +++++ > drivers/tty/serial/imx.c | 82 +++++++++++++++++--- > 2 files changed, 91 insertions(+), 10 deletions(-) > create mode 100644 Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt > > diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt > new file mode 100644 > index 0000000..a9c0406 > --- /dev/null > +++ b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt > @@ -0,0 +1,19 @@ > +* Freescale i.MX Universal Asynchronous Receiver/Transmitter (UART) > + > +Required properties: > +- compatible : Should be "fsl,<soc>-uart" > +- reg : Address and length of the register set for the device > +- interrupts : Should contain uart interrupt > + > +Optional properties: > +- fsl,uart-has-rtscts : Indicate the uart has rts and cts > +- fsl,irda-mode : Indicate the uart supports irda mode > + > +Example: > + > +uart@73fbc000 { > + compatible = "fsl,imx51-uart", "fsl,imx21-uart"; > + reg = <0x73fbc000 0x4000>; > + interrupts = <31>; > + fsl,uart-has-rtscts; > +}; > diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c > index 983f3bd..483c447 100644 > --- a/drivers/tty/serial/imx.c > +++ b/drivers/tty/serial/imx.c > @@ -45,6 +45,8 @@ > #include <linux/delay.h> > #include <linux/rational.h> > #include <linux/slab.h> > +#include <linux/of.h> > +#include <linux/of_device.h> > > #include <asm/io.h> > #include <asm/irq.h> > @@ -239,6 +241,12 @@ static struct platform_device_id imx_uart_devtype[] = { > } > }; > > +static struct of_device_id imx_uart_dt_ids[] = { > + { .compatible = "fsl,imx1-uart", .data = &imx_uart_devdata[IMX1_UART], }, > + { .compatible = "fsl,imx21-uart", .data = &imx_uart_devdata[IMX2_UART], }, > + { /* sentinel */ }, > +}; Isn't this table a bit too small? What about the other SoCs? Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html