From patchwork Thu Mar 28 08:50:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2355581 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 62052DF2A1 for ; Thu, 28 Mar 2013 08:51:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756508Ab3C1Iur (ORCPT ); Thu, 28 Mar 2013 04:50:47 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:46593 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753572Ab3C1Iup (ORCPT ); Thu, 28 Mar 2013 04:50:45 -0400 Received: by mail-pd0-f177.google.com with SMTP id y14so3957160pdi.22 for ; Thu, 28 Mar 2013 01:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=SdjnFJyozDfJ2lAWc8nQrwRC+Km/udEYvS+h5ApLBjw=; b=LEgdgHM1r22IGL1zvL7+rx1eeRIF4mftGUMxdHio1lUza9WEPQvKXWjA+KAa6gPb3R 1tzcMEPoVyUyUetabTSYEXbAO2mt02infhOsh1OJSZpQvtRZkUZQhhxmS1AtoVfzv6C3 +E5ga1gFNvK5fKC8ABXT6b9VJvxc5YYY5kBLg/SrBcb9PWunarSrws8vLheA4NBYLA4h e+31dnlCEEHZiGe61H9iKY/EoXxBzGH8Es8yNsYkkLjr5NW1dy4w2bS6DYWmMABVw8oQ 0ODK8iM3eU/Dtxscw9Njnh/nAwQg/tif2NxE9woJLwt6wAFQv0SYzNylgErdmdqg6DL7 /dQA== X-Received: by 10.68.75.109 with SMTP id b13mr34349493pbw.25.1364460644544; Thu, 28 Mar 2013 01:50:44 -0700 (PDT) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id hs8sm24771041pbc.27.2013.03.28.01.50.40 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 Mar 2013 01:50:43 -0700 (PDT) From: Prabhakar lad To: DLOS , LMML Cc: LKML , Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Sakari Ailus , "Lad, Prabhakar" Subject: [PATCH] davinci: vpif: add pm_runtime support Date: Thu, 28 Mar 2013 14:20:32 +0530 Message-Id: <1364460632-21697-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.4.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Lad, Prabhakar Add pm_runtime support to the TI Davinci VPIF driver. Along side this patch replaces clk_get() with devm_clk_get() to simplify the error handling. Signed-off-by: Lad, Prabhakar --- drivers/media/platform/davinci/vpif.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c index 28638a8..7d14625 100644 --- a/drivers/media/platform/davinci/vpif.c +++ b/drivers/media/platform/davinci/vpif.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -44,7 +45,6 @@ static struct resource *res; spinlock_t vpif_lock; void __iomem *vpif_base; -struct clk *vpif_clk; /** * ch_params: video standard configuration parameters for vpif @@ -421,6 +421,7 @@ EXPORT_SYMBOL(vpif_channel_getfid); static int vpif_probe(struct platform_device *pdev) { + struct clk *vpif_clk; int status = 0; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -439,12 +440,17 @@ static int vpif_probe(struct platform_device *pdev) goto fail; } - vpif_clk = clk_get(&pdev->dev, "vpif"); + vpif_clk = devm_clk_get(&pdev->dev, "vpif"); if (IS_ERR(vpif_clk)) { status = PTR_ERR(vpif_clk); goto clk_fail; } - clk_prepare_enable(vpif_clk); + clk_put(vpif_clk); + + pm_runtime_enable(&pdev->dev); + pm_runtime_resume(&pdev->dev); + + pm_runtime_get(&pdev->dev); spin_lock_init(&vpif_lock); dev_info(&pdev->dev, "vpif probe success\n"); @@ -459,11 +465,6 @@ fail: static int vpif_remove(struct platform_device *pdev) { - if (vpif_clk) { - clk_disable_unprepare(vpif_clk); - clk_put(vpif_clk); - } - iounmap(vpif_base); release_mem_region(res->start, res_len); return 0; @@ -472,13 +473,13 @@ static int vpif_remove(struct platform_device *pdev) #ifdef CONFIG_PM static int vpif_suspend(struct device *dev) { - clk_disable_unprepare(vpif_clk); + pm_runtime_put(dev); return 0; } static int vpif_resume(struct device *dev) { - clk_prepare_enable(vpif_clk); + pm_runtime_get(dev); return 0; }