Skip to content

Commit

Permalink
tty: serial: bcm63xx_uart: add support for DT probing
Browse files Browse the repository at this point in the history
Add a matching table for the the bcm63xx_uart driver on the compatible
string "brcm,bcm6345-uart" which covers all BCM63xx implementations and
reflects the fact that this block was first introduced with the BCM6345
SoC.  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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Florian Fainelli authored and Greg Kroah-Hartman committed Mar 1, 2014
1 parent 5811712 commit 9277285
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions drivers/tty/serial/bcm63xx_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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,bcm6345-uart" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, bcm63xx_of_match);

/*
* platform driver stuff
*/
Expand All @@ -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,
},
};

Expand Down

0 comments on commit 9277285

Please sign in to comment.