From: Rajendra Nayak <rnayak@codeaurora.org> To: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Cc: Rajendra Nayak <rnayak@codeaurora.org>, linux-serial@vger.kernel.org Subject: [RFC/RFT 3/6] serial: msm: convert driver to use runtime PM apis Date: Thu, 23 Apr 2015 14:15:41 +0530 [thread overview] Message-ID: <1429778744-13352-4-git-send-email-rnayak@codeaurora.org> (raw) In-Reply-To: <1429778744-13352-1-git-send-email-rnayak@codeaurora.org> With platform support now in place to manage clocks from within runtime PM callbacks, get rid of all clock handling from the driver and convert the driver to use runtime PM apis. Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org> Cc: <linux-serial@vger.kernel.org> --- drivers/tty/serial/msm_serial.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index b73889c..eb66502 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -33,6 +33,7 @@ #include <linux/serial.h> #include <linux/clk.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <linux/delay.h> #include <linux/of.h> #include <linux/of_device.h> @@ -50,11 +51,11 @@ struct msm_port { struct uart_port uart; char name[16]; struct clk *clk; - struct clk *pclk; unsigned int imr; int is_uartdm; unsigned int old_snap_state; bool break_detected; + struct device *dev; }; static inline void wait_for_xmitr(struct uart_port *port) @@ -464,12 +465,11 @@ static int msm_set_baud_rate(struct uart_port *port, unsigned int baud) return baud; } -static void msm_init_clock(struct uart_port *port) +static void msm_init(struct uart_port *port) { struct msm_port *msm_port = UART_TO_MSM(port); - clk_prepare_enable(msm_port->clk); - clk_prepare_enable(msm_port->pclk); + pm_runtime_get_sync(msm_port->dev); msm_serial_set_mnd_regs(port); } @@ -487,7 +487,7 @@ static int msm_startup(struct uart_port *port) if (unlikely(ret)) return ret; - msm_init_clock(port); + msm_init(port); if (likely(port->fifosize > 12)) rfr_level = port->fifosize - 12; @@ -511,7 +511,7 @@ static void msm_shutdown(struct uart_port *port) msm_port->imr = 0; msm_write(port, 0, UART_IMR); /* disable interrupts */ - clk_disable_unprepare(msm_port->clk); + pm_runtime_put_sync(msm_port->dev); free_irq(port->irq, port); } @@ -669,12 +669,10 @@ static void msm_power(struct uart_port *port, unsigned int state, switch (state) { case 0: - clk_prepare_enable(msm_port->clk); - clk_prepare_enable(msm_port->pclk); + pm_runtime_get_sync(msm_port->dev); break; case 3: - clk_disable_unprepare(msm_port->clk); - clk_disable_unprepare(msm_port->pclk); + pm_runtime_put_sync(msm_port->dev); break; default: pr_err("msm_serial: Unknown PM state %d\n", state); @@ -933,7 +931,7 @@ static int __init msm_console_setup(struct console *co, char *options) if (unlikely(!port->membase)) return -ENXIO; - msm_init_clock(port); + msm_init(port); if (options) uart_parse_options(options, &baud, &parity, &bits, &flow); @@ -1057,13 +1055,10 @@ static int msm_serial_probe(struct platform_device *pdev) if (IS_ERR(msm_port->clk)) return PTR_ERR(msm_port->clk); - if (msm_port->is_uartdm) { - msm_port->pclk = devm_clk_get(&pdev->dev, "iface"); - if (IS_ERR(msm_port->pclk)) - return PTR_ERR(msm_port->pclk); - + if (msm_port->is_uartdm) clk_set_rate(msm_port->clk, 1843200); - } + + msm_port->dev = &pdev->dev; port->uartclk = clk_get_rate(msm_port->clk); dev_info(&pdev->dev, "uartclk = %d\n", port->uartclk); @@ -1080,13 +1075,17 @@ static int msm_serial_probe(struct platform_device *pdev) platform_set_drvdata(pdev, port); + pm_runtime_enable(&pdev->dev); + return uart_add_one_port(&msm_uart_driver, port); } static int msm_serial_remove(struct platform_device *pdev) { struct uart_port *port = platform_get_drvdata(pdev); + struct msm_port *msm_port = UART_TO_MSM(port); + pm_runtime_disable(msm_port->dev); uart_remove_one_port(&msm_uart_driver, port); return 0; -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
WARNING: multiple messages have this Message-ID (diff)
From: rnayak@codeaurora.org (Rajendra Nayak) To: linux-arm-kernel@lists.infradead.org Subject: [RFC/RFT 3/6] serial: msm: convert driver to use runtime PM apis Date: Thu, 23 Apr 2015 14:15:41 +0530 [thread overview] Message-ID: <1429778744-13352-4-git-send-email-rnayak@codeaurora.org> (raw) In-Reply-To: <1429778744-13352-1-git-send-email-rnayak@codeaurora.org> With platform support now in place to manage clocks from within runtime PM callbacks, get rid of all clock handling from the driver and convert the driver to use runtime PM apis. Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org> Cc: <linux-serial@vger.kernel.org> --- drivers/tty/serial/msm_serial.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index b73889c..eb66502 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -33,6 +33,7 @@ #include <linux/serial.h> #include <linux/clk.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <linux/delay.h> #include <linux/of.h> #include <linux/of_device.h> @@ -50,11 +51,11 @@ struct msm_port { struct uart_port uart; char name[16]; struct clk *clk; - struct clk *pclk; unsigned int imr; int is_uartdm; unsigned int old_snap_state; bool break_detected; + struct device *dev; }; static inline void wait_for_xmitr(struct uart_port *port) @@ -464,12 +465,11 @@ static int msm_set_baud_rate(struct uart_port *port, unsigned int baud) return baud; } -static void msm_init_clock(struct uart_port *port) +static void msm_init(struct uart_port *port) { struct msm_port *msm_port = UART_TO_MSM(port); - clk_prepare_enable(msm_port->clk); - clk_prepare_enable(msm_port->pclk); + pm_runtime_get_sync(msm_port->dev); msm_serial_set_mnd_regs(port); } @@ -487,7 +487,7 @@ static int msm_startup(struct uart_port *port) if (unlikely(ret)) return ret; - msm_init_clock(port); + msm_init(port); if (likely(port->fifosize > 12)) rfr_level = port->fifosize - 12; @@ -511,7 +511,7 @@ static void msm_shutdown(struct uart_port *port) msm_port->imr = 0; msm_write(port, 0, UART_IMR); /* disable interrupts */ - clk_disable_unprepare(msm_port->clk); + pm_runtime_put_sync(msm_port->dev); free_irq(port->irq, port); } @@ -669,12 +669,10 @@ static void msm_power(struct uart_port *port, unsigned int state, switch (state) { case 0: - clk_prepare_enable(msm_port->clk); - clk_prepare_enable(msm_port->pclk); + pm_runtime_get_sync(msm_port->dev); break; case 3: - clk_disable_unprepare(msm_port->clk); - clk_disable_unprepare(msm_port->pclk); + pm_runtime_put_sync(msm_port->dev); break; default: pr_err("msm_serial: Unknown PM state %d\n", state); @@ -933,7 +931,7 @@ static int __init msm_console_setup(struct console *co, char *options) if (unlikely(!port->membase)) return -ENXIO; - msm_init_clock(port); + msm_init(port); if (options) uart_parse_options(options, &baud, &parity, &bits, &flow); @@ -1057,13 +1055,10 @@ static int msm_serial_probe(struct platform_device *pdev) if (IS_ERR(msm_port->clk)) return PTR_ERR(msm_port->clk); - if (msm_port->is_uartdm) { - msm_port->pclk = devm_clk_get(&pdev->dev, "iface"); - if (IS_ERR(msm_port->pclk)) - return PTR_ERR(msm_port->pclk); - + if (msm_port->is_uartdm) clk_set_rate(msm_port->clk, 1843200); - } + + msm_port->dev = &pdev->dev; port->uartclk = clk_get_rate(msm_port->clk); dev_info(&pdev->dev, "uartclk = %d\n", port->uartclk); @@ -1080,13 +1075,17 @@ static int msm_serial_probe(struct platform_device *pdev) platform_set_drvdata(pdev, port); + pm_runtime_enable(&pdev->dev); + return uart_add_one_port(&msm_uart_driver, port); } static int msm_serial_remove(struct platform_device *pdev) { struct uart_port *port = platform_get_drvdata(pdev); + struct msm_port *msm_port = UART_TO_MSM(port); + pm_runtime_disable(msm_port->dev); uart_remove_one_port(&msm_uart_driver, port); return 0; -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2015-04-23 8:46 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-23 8:45 [RFC/RFT 0/6] qcom: Add runtime PM support Rajendra Nayak 2015-04-23 8:45 ` Rajendra Nayak 2015-04-23 8:45 ` [RFC/RFT 1/6] PM / clock_ops: Make pm_clk_notify() do nothing in case DT passes power-domains Rajendra Nayak 2015-04-23 8:45 ` Rajendra Nayak 2015-04-23 8:45 ` [RFC/RFT 2/6] clk: qcom: Add runtime support to handle clocks using PM clocks Rajendra Nayak 2015-04-23 8:45 ` Rajendra Nayak 2015-04-24 10:03 ` Ulf Hansson 2015-04-24 10:03 ` Ulf Hansson 2015-04-24 10:58 ` Rajendra Nayak 2015-04-24 10:58 ` Rajendra Nayak 2015-04-26 8:49 ` Geert Uytterhoeven 2015-04-26 8:49 ` Geert Uytterhoeven 2015-04-27 20:02 ` Kevin Hilman 2015-04-27 20:02 ` Kevin Hilman 2015-04-28 2:52 ` Rajendra Nayak 2015-04-28 2:52 ` Rajendra Nayak 2015-04-28 7:25 ` Geert Uytterhoeven 2015-04-28 7:25 ` Geert Uytterhoeven 2015-04-29 9:49 ` Rajendra Nayak 2015-04-29 9:49 ` Rajendra Nayak 2015-04-29 11:30 ` Geert Uytterhoeven 2015-04-29 11:30 ` Geert Uytterhoeven 2015-04-29 12:31 ` Ulf Hansson 2015-04-29 12:31 ` Ulf Hansson 2015-04-29 13:08 ` Geert Uytterhoeven 2015-04-29 13:08 ` Geert Uytterhoeven 2015-04-30 6:21 ` Ulf Hansson 2015-04-30 6:21 ` Ulf Hansson 2015-04-30 9:02 ` Ulf Hansson 2015-04-30 9:02 ` Ulf Hansson 2015-04-27 7:08 ` Ulf Hansson 2015-04-27 7:08 ` Ulf Hansson 2015-04-23 8:45 ` Rajendra Nayak [this message] 2015-04-23 8:45 ` [RFC/RFT 3/6] serial: msm: convert driver to use runtime PM apis Rajendra Nayak 2015-04-29 0:16 ` Stephen Boyd 2015-04-29 0:16 ` Stephen Boyd 2015-04-29 3:15 ` Rajendra Nayak 2015-04-29 3:15 ` Rajendra Nayak 2015-04-23 8:45 ` [RFC/RFT 4/6] mmc: sdhci-msm: " Rajendra Nayak 2015-04-23 8:45 ` Rajendra Nayak 2015-04-23 13:21 ` Ulf Hansson 2015-04-23 13:21 ` Ulf Hansson 2015-04-23 13:42 ` Rajendra Nayak 2015-04-23 13:42 ` Rajendra Nayak 2015-04-23 21:15 ` Kevin Hilman 2015-04-23 21:15 ` Kevin Hilman 2015-04-24 0:45 ` Rajendra Nayak 2015-04-24 0:45 ` Rajendra Nayak 2015-04-23 13:43 ` Rajendra Nayak 2015-04-23 13:43 ` Rajendra Nayak 2015-04-23 8:45 ` [RFC/RFT 5/6] i2c: qup: Get rid of clock handling as its done using runtime callbacks Rajendra Nayak 2015-04-23 8:45 ` Rajendra Nayak 2015-04-23 21:16 ` Kevin Hilman 2015-04-23 21:16 ` Kevin Hilman 2015-04-24 2:32 ` Rajendra Nayak 2015-04-24 2:32 ` Rajendra Nayak 2015-04-25 7:01 ` Ivan T. Ivanov 2015-04-25 7:01 ` Ivan T. Ivanov 2015-04-27 2:36 ` Rajendra Nayak 2015-04-27 2:36 ` Rajendra Nayak 2015-04-23 8:45 ` [RFC/RFT 6/6] spi: " Rajendra Nayak 2015-04-23 8:45 ` Rajendra Nayak
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1429778744-13352-4-git-send-email-rnayak@codeaurora.org \ --to=rnayak@codeaurora.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-serial@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.