Revert "serial: sirf: add a new uart type support"

This reverts commit 52bec4ed4e("serial: sirf: add a new uart type
support").
we misunderstood the clock dependency in atlas7. Actually involved
several clocks are in a tree structure. we still only need to take
the leaf clock node for BT uarts.

Signed-off-by: Qipan Li <Qipan.Li@csr.com>
Signed-off-by: Barry Song <Barry.Song@csr.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/devicetree/bindings/serial/sirf-uart.txt b/Documentation/devicetree/bindings/serial/sirf-uart.txt
index f0c39261c5d4443927737eee98c73076fb0632ad..67e2a0aeb0429572a3b6604b8e1100a2b84d4b72 100644 (file)
--- a/Documentation/devicetree/bindings/serial/sirf-uart.txt
+++ b/Documentation/devicetree/bindings/serial/sirf-uart.txt
@@ -2,8 +2,7 @@
 
 Required properties:
 - compatible : Should be "sirf,prima2-uart", "sirf, prima2-usp-uart",
-               "sirf,atlas7-uart" or "sirf,atlas7-bt-uart" which means
-               uart located in BT module and used for BT.
+               "sirf,atlas7-uart" or "sirf,atlas7-usp-uart".
 - reg : Offset and length of the register set for the device
 - interrupts : Should contain uart interrupt
 - fifosize : Should define hardware rx/tx fifo size
@@ -33,15 +32,3 @@ usp@b0090000 {
        rts-gpios = <&gpio 15 0>;
        cts-gpios = <&gpio 46 0>;
 };
-
-for uart use in BT module,
-uart6: uart@11000000 {
-       cell-index = <6>;
-       compatible = "sirf,atlas7-bt-uart", "sirf,atlas7-uart";
-       reg = <0x11000000 0x1000>;
-       interrupts = <0 100 0>;
-       clocks = <&clks 138>, <&clks 140>, <&clks 141>;
-       clock-names = "uart", "general", "noc";
-       fifosize = <128>;
-       status = "disabled";
-}

diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 9de3eabe57372c49322e45034c99a3de99b59ae9..8081cdba87787f622761dc7b20e8e34988d39c82 100644 (file)
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -1032,19 +1032,10 @@ 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 (sirfport->is_bt_uart) {
-                       clk_prepare_enable(sirfport->clk_noc);
-                       clk_prepare_enable(sirfport->clk_general);
-               }
+       if (!state)
                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)
@@ -1387,26 +1378,12 @@ usp_no_flow_control:
        }
        port->irq = res->start;
 
-       sirfport->clk = devm_clk_get(&pdev->dev, NULL);
+       sirfport->clk = 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,atlas7-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);
@@ -1415,7 +1392,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 err;
+               goto port_err;
        }
 
        sirfport->rx_dma_chan = dma_request_slave_channel(port->dev, "rx");
@@ -1444,6 +1421,8 @@ 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;
 }
@@ -1452,6 +1431,7 @@ 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;

diff --git a/drivers/tty/serial/sirfsoc_uart.h b/drivers/tty/serial/sirfsoc_uart.h
index 727eb6b88fff0f28e57d44dc789223f2855231b3..11fd6814f76d0ab1efc920655acebe5f58fd19df 100644 (file)
--- a/drivers/tty/serial/sirfsoc_uart.h
+++ b/drivers/tty/serial/sirfsoc_uart.h
@@ -417,10 +417,6 @@ struct sirfsoc_uart_port {
 
        struct uart_port                port;
        struct clk                      *clk;
-       /* UART6 for BT usage in A7DA platform need multi-clock source */
-       bool                            is_bt_uart;
-       struct clk                      *clk_general;
-       struct clk                      *clk_noc;
        /* for SiRFatlas7, there are SET/CLR for UART_INT_EN */
        bool                            is_atlas7;
        struct sirfsoc_uart_register    *uart_reg;