Commit 048c1df7 authored Oct 21, 2014 by Kevin Cernekee Committed by Greg Kroah-Hartman Nov 06, 2014

tty: serial: bcm63xx: Add support for unnamed clock outputs from DT

The original non-DT bcm63xx clk code ignores the struct device argument
and looks up a global clock name. DT platforms, by contrast, often just
use a phandle to reference a clock node with no "clock-output-names"
property. Modify the UART driver to support both schemes.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent c0ec3fd1

drivers/tty/serial/bcm63xx_uart.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -824,7 +824,8 @@ static int bcm_uart_probe(struct platform_device *pdev)
		if (!res_irq)
		return -ENODEV;

		clk = clk_get(&pdev->dev, "periph");
		clk = pdev->dev.of_node ? of_clk_get(pdev->dev.of_node, 0) :
		clk_get(&pdev->dev, "periph");
		if (IS_ERR(clk))
		return -ENODEV;