From mboxrd@z Thu Jan 1 00:00:00 1970 From: s.hauer@pengutronix.de (Sascha Hauer) Date: Mon, 4 Jul 2011 08:58:20 +0200 Subject: [PATCH 2/2] serial/imx: add device tree probe support In-Reply-To: <1309679760-22796-3-git-send-email-shawn.guo@linaro.org> References: <1309679760-22796-1-git-send-email-shawn.guo@linaro.org> <1309679760-22796-3-git-send-email-shawn.guo@linaro.org> Message-ID: <20110704065820.GY6069@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > Signed-off-by: Jason Liu > Signed-off-by: Shawn Guo > Cc: Sascha Hauer > Cc: Alan Cox > Cc: Grant Likely > --- > .../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,-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 at 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 > #include > #include > +#include > +#include > > #include > #include > @@ -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 |