2014-02-19 16:00 GMT-08:00 Jonas Gorski [off-list ref]:

On Thu, Feb 20, 2014 at 12:22 AM, Florian Fainelli [off-list ref] wrote:

quoted

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" },

From my understanding, this should be "brcm,bcm6345-uart", because
this kind of uart appeared first on bcm6345 (well, maybe bcm6335, no
idea which one of these two was first, but the latter was never
supported in mainline anyway).

That's right, in fact, I think it might be desirable to handle both
compatible string, just as a hint that it is compatible with the
entire bcm63xx family. Would that work for you?

The same applies to 4/4.

quoted

+       { /* 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,

You could guard this one with of_match_ptr (and then bcm63xx_of_match
with CONFIG_OF. Probably not much, but it's the little things ;-)

Good catch.
-- 
Florian