From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752165AbdFLMpM (ORCPT ); Mon, 12 Jun 2017 08:45:12 -0400 Received: from smtp4-g21.free.fr ([212.27.42.4]:31885 "EHLO smtp4-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751494AbdFLMpK (ORCPT ); Mon, 12 Jun 2017 08:45:10 -0400 Subject: Re: [PATCH v4 2/7] tty/serial: meson_uart: update to stable bindings To: Neil Armstrong , gregkh@linuxfoundation.org, khilman@baylibre.com Cc: linux-kernel@vger.kernel.org, Helmut Klein , linux-serial@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org References: <1497001756-942-1-git-send-email-narmstrong@baylibre.com> <1497001756-942-3-git-send-email-narmstrong@baylibre.com> From: Chris Moore Message-ID: <5096bbb9-aa11-ad9b-139e-e056463d1a1d@free.fr> Date: Mon, 12 Jun 2017 14:45:04 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <1497001756-942-3-git-send-email-narmstrong@baylibre.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: fr Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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);