From mboxrd@z Thu Jan 1 00:00:00 1970 From: narmstrong@baylibre.com (Neil Armstrong) Date: Mon, 12 Jun 2017 14:48:17 +0200 Subject: [PATCH v4 2/7] tty/serial: meson_uart: update to stable bindings In-Reply-To: <5096bbb9-aa11-ad9b-139e-e056463d1a1d@free.fr> References: <1497001756-942-1-git-send-email-narmstrong@baylibre.com> <1497001756-942-3-git-send-email-narmstrong@baylibre.com> <5096bbb9-aa11-ad9b-139e-e056463d1a1d@free.fr> Message-ID: <4512095a-f4b7-54c4-520e-2ae65c04c361@baylibre.com> To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.org On 06/12/2017 02:45 PM, Chris Moore wrote: > Le 09/06/2017 ? 11:49, Neil Armstrong a ?crit : >> From: Helmut Klein >> >> 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 >> Signed-off-by: Neil Armstrong >> --- >> 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); > Good catch, Thanks ! Neil