From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932318Ab3COUGp (ORCPT ); Fri, 15 Mar 2013 16:06:45 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:56675 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932156Ab3COUGi (ORCPT ); Fri, 15 Mar 2013 16:06:38 -0400 From: Maxime Ripard To: linux-arm-kernel@lists.infradead.org Cc: kevin@allwinnertech.com, sunny@allwinnertech.com, shuge@allwinnertech.com, =?UTF-8?q?Emilio=20L=C3=B3pez?= , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/6] serial: 8250_dw: add support for clk api Date: Fri, 15 Mar 2013 21:06:23 +0100 Message-Id: <1363377988-4966-2-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363377988-4966-1-git-send-email-maxime.ripard@free-electrons.com> References: <1363377988-4966-1-git-send-email-maxime.ripard@free-electrons.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Emilio López This commit implements support for using the clk api; this lets us use the "clocks" property with device tree, instead of having to use clock-frequency. Signed-off-by: Emilio López Signed-off-by: Maxime Ripard --- drivers/tty/serial/8250/8250_dw.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index db0e66f..9a834a1 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "8250.h" @@ -55,8 +56,9 @@ struct dw8250_data { - int last_lcr; - int line; + int last_lcr; + int line; + struct clk *clk; }; static void dw8250_serial_out(struct uart_port *p, int offset, int value) @@ -136,8 +138,13 @@ static int dw8250_probe_of(struct uart_port *p) if (!of_property_read_u32(np, "reg-shift", &val)) p->regshift = val; + /* clock got configured through clk api, all done */ + if (p->uartclk) + return 0; + + /* try to find out clock frequency from DT as fallback */ if (of_property_read_u32(np, "clock-frequency", &val)) { - dev_err(p->dev, "no clock-frequency property set\n"); + dev_err(p->dev, "clk or clock-frequency not defined\n"); return -EINVAL; } p->uartclk = val; @@ -294,9 +301,21 @@ static int dw8250_probe(struct platform_device *pdev) if (!uart.port.membase) return -ENOMEM; + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(data->clk)) + data->clk = NULL; + else + clk_prepare_enable(data->clk); + uart.port.iotype = UPIO_MEM; uart.port.serial_in = dw8250_serial_in; uart.port.serial_out = dw8250_serial_out; + uart.port.private_data = data; + uart.port.uartclk = clk_get_rate(data->clk); dw8250_setup_port(&uart); @@ -312,12 +331,6 @@ static int dw8250_probe(struct platform_device *pdev) return -ENODEV; } - data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); - if (!data) - return -ENOMEM; - - uart.port.private_data = data; - data->line = serial8250_register_8250_port(&uart); if (data->line < 0) return data->line; @@ -333,6 +346,8 @@ static int dw8250_remove(struct platform_device *pdev) serial8250_unregister_port(data->line); + clk_disable_unprepare(data->clk); + return 0; } -- 1.7.10.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Ripard Subject: [PATCH 1/6] serial: 8250_dw: add support for clk api Date: Fri, 15 Mar 2013 21:06:23 +0100 Message-ID: <1363377988-4966-2-git-send-email-maxime.ripard@free-electrons.com> References: <1363377988-4966-1-git-send-email-maxime.ripard@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail.free-electrons.com ([94.23.35.102]:56675 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932156Ab3COUGi (ORCPT ); Fri, 15 Mar 2013 16:06:38 -0400 In-Reply-To: <1363377988-4966-1-git-send-email-maxime.ripard@free-electrons.com> Sender: linux-serial-owner@vger.kernel.org List-Id: linux-serial@vger.kernel.org To: linux-arm-kernel@lists.infradead.org Cc: kevin@allwinnertech.com, sunny@allwinnertech.com, shuge@allwinnertech.com, =?UTF-8?q?Emilio=20L=C3=B3pez?= , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org =46rom: Emilio L=C3=B3pez This commit implements support for using the clk api; this lets us use the "clocks" property with device tree, instead of having to use clock-frequency. Signed-off-by: Emilio L=C3=B3pez Signed-off-by: Maxime Ripard --- drivers/tty/serial/8250/8250_dw.c | 33 ++++++++++++++++++++++++-----= ---- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/825= 0/8250_dw.c index db0e66f..9a834a1 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -26,6 +26,7 @@ #include #include #include +#include =20 #include "8250.h" =20 @@ -55,8 +56,9 @@ =20 =20 struct dw8250_data { - int last_lcr; - int line; + int last_lcr; + int line; + struct clk *clk; }; =20 static void dw8250_serial_out(struct uart_port *p, int offset, int val= ue) @@ -136,8 +138,13 @@ static int dw8250_probe_of(struct uart_port *p) if (!of_property_read_u32(np, "reg-shift", &val)) p->regshift =3D val; =20 + /* clock got configured through clk api, all done */ + if (p->uartclk) + return 0; + + /* try to find out clock frequency from DT as fallback */ if (of_property_read_u32(np, "clock-frequency", &val)) { - dev_err(p->dev, "no clock-frequency property set\n"); + dev_err(p->dev, "clk or clock-frequency not defined\n"); return -EINVAL; } p->uartclk =3D val; @@ -294,9 +301,21 @@ static int dw8250_probe(struct platform_device *pd= ev) if (!uart.port.membase) return -ENOMEM; =20 + data =3D devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->clk =3D devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(data->clk)) + data->clk =3D NULL; + else + clk_prepare_enable(data->clk); + uart.port.iotype =3D UPIO_MEM; uart.port.serial_in =3D dw8250_serial_in; uart.port.serial_out =3D dw8250_serial_out; + uart.port.private_data =3D data; + uart.port.uartclk =3D clk_get_rate(data->clk); =20 dw8250_setup_port(&uart); =20 @@ -312,12 +331,6 @@ static int dw8250_probe(struct platform_device *pd= ev) return -ENODEV; } =20 - data =3D devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); - if (!data) - return -ENOMEM; - - uart.port.private_data =3D data; - data->line =3D serial8250_register_8250_port(&uart); if (data->line < 0) return data->line; @@ -333,6 +346,8 @@ static int dw8250_remove(struct platform_device *pd= ev) =20 serial8250_unregister_port(data->line); =20 + clk_disable_unprepare(data->clk); + return 0; } =20 --=20 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-serial"= in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: maxime.ripard@free-electrons.com (Maxime Ripard) Date: Fri, 15 Mar 2013 21:06:23 +0100 Subject: [PATCH 1/6] serial: 8250_dw: add support for clk api In-Reply-To: <1363377988-4966-1-git-send-email-maxime.ripard@free-electrons.com> References: <1363377988-4966-1-git-send-email-maxime.ripard@free-electrons.com> Message-ID: <1363377988-4966-2-git-send-email-maxime.ripard@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Emilio L?pez This commit implements support for using the clk api; this lets us use the "clocks" property with device tree, instead of having to use clock-frequency. Signed-off-by: Emilio L?pez Signed-off-by: Maxime Ripard --- drivers/tty/serial/8250/8250_dw.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index db0e66f..9a834a1 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "8250.h" @@ -55,8 +56,9 @@ struct dw8250_data { - int last_lcr; - int line; + int last_lcr; + int line; + struct clk *clk; }; static void dw8250_serial_out(struct uart_port *p, int offset, int value) @@ -136,8 +138,13 @@ static int dw8250_probe_of(struct uart_port *p) if (!of_property_read_u32(np, "reg-shift", &val)) p->regshift = val; + /* clock got configured through clk api, all done */ + if (p->uartclk) + return 0; + + /* try to find out clock frequency from DT as fallback */ if (of_property_read_u32(np, "clock-frequency", &val)) { - dev_err(p->dev, "no clock-frequency property set\n"); + dev_err(p->dev, "clk or clock-frequency not defined\n"); return -EINVAL; } p->uartclk = val; @@ -294,9 +301,21 @@ static int dw8250_probe(struct platform_device *pdev) if (!uart.port.membase) return -ENOMEM; + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(data->clk)) + data->clk = NULL; + else + clk_prepare_enable(data->clk); + uart.port.iotype = UPIO_MEM; uart.port.serial_in = dw8250_serial_in; uart.port.serial_out = dw8250_serial_out; + uart.port.private_data = data; + uart.port.uartclk = clk_get_rate(data->clk); dw8250_setup_port(&uart); @@ -312,12 +331,6 @@ static int dw8250_probe(struct platform_device *pdev) return -ENODEV; } - data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); - if (!data) - return -ENOMEM; - - uart.port.private_data = data; - data->line = serial8250_register_8250_port(&uart); if (data->line < 0) return data->line; @@ -333,6 +346,8 @@ static int dw8250_remove(struct platform_device *pdev) serial8250_unregister_port(data->line); + clk_disable_unprepare(data->clk); + return 0; } -- 1.7.10.4