From patchwork Wed Aug 2 16:32:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franklin Cooper X-Patchwork-Id: 9877077 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E35A760360 for ; Wed, 2 Aug 2017 16:33:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4509287F0 for ; Wed, 2 Aug 2017 16:33:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C90C9287FD; Wed, 2 Aug 2017 16:33:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 29E79287F0 for ; Wed, 2 Aug 2017 16:33:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=XZOyEkVUzKHgmE0c//3NVh2Khc3hl1AQyXFOAqLJis8=; b=Jz56hTWTIqz9ha lKstMc0AyNjjhDFGWCWdzrc36b8tg3l/yp34z+Url9oGSt/5bqbm2Bdnun51MC/EYjb7S555GAJRU yqKgEs3sYTg70rEhHULpyjT4iHHXG5Z6vE3o1nH4cvtCEBV4k9f/vQQAFBZe+oaqC+2sD+3wycPcy 9MBSQ7cdL4HzC7nbCto7MUxBwoaBdIwp7/tm0NpQZVwemvi9p+7F/JVH6iZaO/dc6chmio0BfGt7R nQx457Qwafc8L1/mv42kRnc56a4Qv8W474adNqhmOAZyXAtgXNILEMeq+gdrHfBysueHb3saXWo9y m9CoFTuh7k8uHRyUo1OQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dcwaN-0002F9-FC; Wed, 02 Aug 2017 16:33:27 +0000 Received: from fllnx209.ext.ti.com ([198.47.19.16]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dcwaJ-0002D7-EJ for linux-arm-kernel@lists.infradead.org; Wed, 02 Aug 2017 16:33:25 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllnx209.ext.ti.com (8.15.1/8.15.1) with ESMTP id v72GWYOP021349; Wed, 2 Aug 2017 11:32:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1501691554; bh=u+tEGqpxh6Ra8aNCq6rhZw1wdGs8zBB9SkidfsOTo1s=; h=From:To:CC:Subject:Date; b=WrDuHPIYi8OuhHpaEFPo+ZZC8ZCUVAwAOyGmiOP1YSn8XoTiLJgJnqz63Ju5w4RbA 3PPPNDA31WJW8OxUjQRh9bDrbwJP8UVYcDvPbv+47Kdq2lS95OAS1yUJWhuVx6ltTX npMpzvln0xk1TH55RfRuv2g5dQstMn2cpEMlqrB8= Received: from DFLE102.ent.ti.com (dfle102.ent.ti.com [10.64.6.23]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v72GWTlY002361; Wed, 2 Aug 2017 11:32:29 -0500 Received: from DFLE108.ent.ti.com (10.64.6.29) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Wed, 2 Aug 2017 11:32:29 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Wed, 2 Aug 2017 11:32:29 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend Transport; Wed, 2 Aug 2017 11:32:29 -0500 Received: from dbdmail01.india.ti.com (dbdmail01.india.ti.com [172.24.162.206]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v72GWScK014848; Wed, 2 Aug 2017 11:32:28 -0500 Received: from uda0273011.dhcp.ti.com (uda0273011.dhcp.ti.com [128.247.59.33]) by dbdmail01.india.ti.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id v72GWOrG026935; Wed, 2 Aug 2017 22:02:25 +0530 From: Franklin S Cooper Jr To: , , , Subject: [PATCH] serial: 8250_of: Add basic PM runtime support Date: Wed, 2 Aug 2017 11:32:18 -0500 Message-ID: <20170802163218.14377-1-fcooper@ti.com> X-Mailer: git-send-email 2.9.4.dirty MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170802_093323_665278_EF946F02 X-CRM114-Status: UNSURE ( 8.81 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Franklin S Cooper Jr Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add basic PM Runtime support. Signed-off-by: Franklin S Cooper Jr --- drivers/tty/serial/8250/8250_of.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c index 6c5a8ca..94e7c93 100644 --- a/drivers/tty/serial/8250/8250_of.c +++ b/drivers/tty/serial/8250/8250_of.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -65,6 +66,10 @@ static int of_platform_serial_setup(struct platform_device *ofdev, int ret; memset(port, 0, sizeof *port); + + pm_runtime_enable(&ofdev->dev); + pm_runtime_get_sync(&ofdev->dev); + if (of_property_read_u32(np, "clock-frequency", &clk)) { /* Get clk rate through clk driver if present */ @@ -72,12 +77,13 @@ static int of_platform_serial_setup(struct platform_device *ofdev, if (IS_ERR(info->clk)) { dev_warn(&ofdev->dev, "clk or clock-frequency not defined\n"); - return PTR_ERR(info->clk); + ret = PTR_ERR(info->clk); + goto err_pmruntime; } ret = clk_prepare_enable(info->clk); if (ret < 0) - return ret; + goto err_pmruntime; clk = clk_get_rate(info->clk); } @@ -170,8 +176,10 @@ static int of_platform_serial_setup(struct platform_device *ofdev, err_dispose: irq_dispose_mapping(port->irq); err_unprepare: - if (info->clk) - clk_disable_unprepare(info->clk); + clk_disable_unprepare(info->clk); +err_pmruntime: + pm_runtime_put_sync(&ofdev->dev); + pm_runtime_disable(&ofdev->dev); return ret; } @@ -227,8 +235,9 @@ static int of_platform_serial_probe(struct platform_device *ofdev) return 0; err_dispose: irq_dispose_mapping(port8250.port.irq); - if (info->clk) - clk_disable_unprepare(info->clk); + pm_runtime_put_sync(&ofdev->dev); + pm_runtime_disable(&ofdev->dev); + clk_disable_unprepare(info->clk); err_free: kfree(info); return ret; @@ -244,8 +253,9 @@ static int of_platform_serial_remove(struct platform_device *ofdev) serial8250_unregister_port(info->line); reset_control_assert(info->rst); - if (info->clk) - clk_disable_unprepare(info->clk); + pm_runtime_put_sync(&ofdev->dev); + pm_runtime_disable(&ofdev->dev); + clk_disable_unprepare(info->clk); kfree(info); return 0; } @@ -259,9 +269,10 @@ static int of_serial_suspend(struct device *dev) serial8250_suspend_port(info->line); - if (info->clk && (!uart_console(port) || console_suspend_enabled)) + if ((!uart_console(port) || console_suspend_enabled)) { + pm_runtime_put_sync(&ofdev->dev); clk_disable_unprepare(info->clk); - + } return 0; } @@ -271,8 +282,10 @@ static int of_serial_resume(struct device *dev) struct uart_8250_port *port8250 = serial8250_get_port(info->line); struct uart_port *port = &port8250->port; - if (info->clk && (!uart_console(port) || console_suspend_enabled)) + if ((!uart_console(port) || console_suspend_enabled)) { + pm_runtime_get_sync(&ofdev->dev); clk_prepare_enable(info->clk); + } serial8250_resume_port(info->line);