Le 09/06/2017 à 11:49, Neil Armstrong a écrit :
From: Helmut Klein <hgkr.kl...@gmail.com>

This patch handle the stable UART bindings but also keeps compatibility
with the legacy non-stable bindings until all boards uses them.

Signed-off-by: Helmut Klein <hgkr.kl...@gmail.com>
Signed-off-by: Neil Armstrong <narmstr...@baylibre.com>
---
  drivers/tty/serial/meson_uart.c | 109 +++++++++++++++++++++++++++++++++++++---
  1 file changed, 103 insertions(+), 6 deletions(-)

diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index 60f1679..d2c8136 100644
--- a/drivers/tty/serial/meson_uart.c
+++ b/drivers/tty/serial/meson_uart.c

[snip]

+static int meson_uart_probe_clocks(struct platform_device *pdev,
+                                  struct uart_port *port)
+{
+       struct clk *clk_xtal = NULL;
+       struct clk *clk_pclk = NULL;
+       struct clk *clk_baud = NULL;
+       int ret;
+
+       clk_pclk = devm_clk_get(&pdev->dev, "pclk");
+       if (IS_ERR(clk_pclk))
+               return PTR_ERR(clk_pclk);
+
+       clk_xtal = devm_clk_get(&pdev->dev, "xtal");
+       if (IS_ERR(clk_xtal))
+               return PTR_ERR(clk_xtal);
+
+       clk_baud = devm_clk_get(&pdev->dev, "baud");
+       if (IS_ERR(clk_xtal))

Copy/paste error: s/clk_xtal/clk_baud/

+               return PTR_ERR(clk_baud);

Reply via email to