devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: linux-serial@vger.kernel.org
Cc: devicetree@vger.kernel.org, mbizon@freebox.fr, jogo@openwrt.org,
	gregkh@linuxfoundation.org,
	Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH 3/4] tty: serial: bcm63xx_uart: add support for DT probing
Date: Wed, 19 Feb 2014 15:22:46 -0800	[thread overview]
Message-ID: <1392852167-26243-4-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1392852167-26243-1-git-send-email-f.fainelli@gmail.com>

Add a matching table for the the bcm63xx_uart driver on the compatible
string "brcm,bcm63xx-uart" which covers all BCM63xx implementations.
Also make sure that we convert the id based on the uart aliases provided
by the relevant Device Tree.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/tty/serial/bcm63xx_uart.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index 37e7e33..538e84c 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -31,6 +31,7 @@
 #include <linux/serial_core.h>
 #include <linux/serial_bcm63xx.h>
 #include <linux/io.h>
+#include <linux/of.h>
 
 #define BCM63XX_NR_UARTS	2
 
@@ -806,6 +807,9 @@ static int bcm_uart_probe(struct platform_device *pdev)
 	struct clk *clk;
 	int ret;
 
+	if (pdev->dev.of_node)
+		pdev->id = of_alias_get_id(pdev->dev.of_node, "uart");
+
 	if (pdev->id < 0 || pdev->id >= BCM63XX_NR_UARTS)
 		return -EINVAL;
 
@@ -857,6 +861,12 @@ static int bcm_uart_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id bcm63xx_of_match[] = {
+	{ .compatible = "brcm,bcm63xx-uart" },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, bcm63xx_of_match);
+
 /*
  * platform driver stuff
  */
@@ -866,6 +876,7 @@ static struct platform_driver bcm_uart_platform_driver = {
 	.driver	= {
 		.owner = THIS_MODULE,
 		.name  = "bcm63xx_uart",
+		.of_match_table = bcm63xx_of_match,
 	},
 };
 
-- 
1.8.3.2


  parent reply	other threads:[~2014-02-19 23:22 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-19 23:22 [PATCH 0/4] Device Tree probing for bcm63xx-uart Florian Fainelli
2014-02-19 23:22 ` [PATCH 1/4] tty: serial: bcm63xx_uart: include linux/io.h Florian Fainelli
2014-02-19 23:22 ` [PATCH 2/4] tty: serial: bcm63xx_uart: define UART_REG_SIZE constant Florian Fainelli
2014-02-19 23:22 ` Florian Fainelli [this message]
2014-02-20  0:00   ` [PATCH 3/4] tty: serial: bcm63xx_uart: add support for DT probing Jonas Gorski
2014-02-20  1:29     ` Florian Fainelli
2014-02-20 10:59       ` Jonas Gorski
2014-02-20 12:16         ` Arnd Bergmann
2014-02-20 16:18           ` Florian Fainelli
2014-02-20 12:21         ` Mark Rutland
2014-02-19 23:22 ` [PATCH 4/4] Documentation: devicetree: add bindings documentation for bcm63xx-uart Florian Fainelli
2014-02-20  9:45   ` Mark Rutland

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392852167-26243-4-git-send-email-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jogo@openwrt.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=mbizon@freebox.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).