Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / tty / serial / sirfsoc_uart.c

diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 775a6e369e466a77a0978c2fb0d443fae1c08751..b269f6bd16d69f67126d444e79ef154dabbe573e 100644 (file)
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -1032,10 +1032,19 @@ static void sirfsoc_uart_pm(struct uart_port *port, unsigned int state,
                              unsigned int oldstate)
 {
        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
-       if (!state)
+       if (!state) {
+               if (sirfport->is_bt_uart) {
+                       clk_prepare_enable(sirfport->clk_noc);
+                       clk_prepare_enable(sirfport->clk_general);
+               }
                clk_prepare_enable(sirfport->clk);
-       else
+       } else {
                clk_disable_unprepare(sirfport->clk);
+               if (sirfport->is_bt_uart) {
+                       clk_disable_unprepare(sirfport->clk_general);
+                       clk_disable_unprepare(sirfport->clk_noc);
+               }
+       }
 }
 
 static int sirfsoc_uart_startup(struct uart_port *port)
@@ -1378,12 +1387,26 @@ usp_no_flow_control:
        }
        port->irq = res->start;
 
-       sirfport->clk = clk_get(&pdev->dev, NULL);
+       sirfport->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(sirfport->clk)) {
                ret = PTR_ERR(sirfport->clk);
                goto err;
        }
        port->uartclk = clk_get_rate(sirfport->clk);
+       if (of_device_is_compatible(pdev->dev.of_node, "sirf,marco-bt-uart")) {
+               sirfport->clk_general = devm_clk_get(&pdev->dev, "general");
+               if (IS_ERR(sirfport->clk_general)) {
+                       ret = PTR_ERR(sirfport->clk_general);
+                       goto err;
+               }
+               sirfport->clk_noc = devm_clk_get(&pdev->dev, "noc");
+               if (IS_ERR(sirfport->clk_noc)) {
+                       ret = PTR_ERR(sirfport->clk_noc);
+                       goto err;
+               }
+               sirfport->is_bt_uart = true;
+       } else
+               sirfport->is_bt_uart = false;
 
        port->ops = &sirfsoc_uart_ops;
        spin_lock_init(&port->lock);
@@ -1392,7 +1415,7 @@ usp_no_flow_control:
        ret = uart_add_one_port(&sirfsoc_uart_drv, port);
        if (ret != 0) {
                dev_err(&pdev->dev, "Cannot add UART port(%d).\n", pdev->id);
-               goto port_err;
+               goto err;
        }
 
        sirfport->rx_dma_chan = dma_request_slave_channel(port->dev, "rx");
@@ -1421,8 +1444,6 @@ alloc_coherent_err:
                                sirfport->rx_dma_items[j].xmit.buf,
                                sirfport->rx_dma_items[j].dma_addr);
        dma_release_channel(sirfport->rx_dma_chan);
-port_err:
-       clk_put(sirfport->clk);
 err:
        return ret;
 }
@@ -1431,7 +1452,6 @@ static int sirfsoc_uart_remove(struct platform_device *pdev)
 {
        struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);
        struct uart_port *port = &sirfport->port;
-       clk_put(sirfport->clk);
        uart_remove_one_port(&sirfsoc_uart_drv, port);
        if (sirfport->rx_dma_chan) {
                int i;