On Fri, Feb 18, 2011 at 09:10:01AM +0100, Tobias Klauser wrote:
> Advertise the possibility to use this driver with device tree if
> CONFIG_OF is set.
>
> Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxx>
Applied, thanks.
g.
> ---
> v3:
> - put device tree binding documentation in the correct place (thanks Grant
> Likely)
> v2:
> - add missing semicolon after definition of altera_jtaguart_match
>
> .../devicetree/bindings/serial/altera_jtaguart.txt | 4 ++++
> drivers/tty/serial/altera_jtaguart.c | 15 +++++++++++++--
> 2 files changed, 17 insertions(+), 2 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/serial/altera_jtaguart.txt
>
> diff --git a/Documentation/devicetree/bindings/serial/altera_jtaguart.txt b/Documentation/devicetree/bindings/serial/altera_jtaguart.txt
> new file mode 100644
> index 0000000..c152f65
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/serial/altera_jtaguart.txt
> @@ -0,0 +1,4 @@
> +Altera JTAG UART
> +
> +Required properties:
> +- compatible : should be "ALTR,juart-1.0"
> diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
> index 8f014bb..60e049b 100644
> --- a/drivers/tty/serial/altera_jtaguart.c
> +++ b/drivers/tty/serial/altera_jtaguart.c
> @@ -466,12 +466,23 @@ static int __devexit altera_jtaguart_remove(struct platform_device *pdev)
> return 0;
> }
>
> +#ifdef CONFIG_OF
> +static struct of_device_id altera_jtaguart_match[] = {
> + { .compatible = "ALTR,juart-1.0", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
> +#else
> +#define altera_jtaguart_match NULL
> +#endif /* CONFIG_OF */
> +
> static struct platform_driver altera_jtaguart_platform_driver = {
> .probe = altera_jtaguart_probe,
> .remove = __devexit_p(altera_jtaguart_remove),
> .driver = {
> - .name = DRV_NAME,
> - .owner = THIS_MODULE,
> + .name = DRV_NAME,
> + .owner = THIS_MODULE,
> + .of_match_table = altera_jtaguart_match,
> },
> };
>
> --
> 1.7.0.4
>
--
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
