From patchwork Mon Apr 1 06:36:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2369341 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 7FE993FD40 for ; Mon, 1 Apr 2013 06:37:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752982Ab3DAGhG (ORCPT ); Mon, 1 Apr 2013 02:37:06 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:43291 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751648Ab3DAGhF (ORCPT ); Mon, 1 Apr 2013 02:37:05 -0400 Received: by mail-pa0-f52.google.com with SMTP id fb10so1175010pad.11 for ; Sun, 31 Mar 2013 23:37:04 -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=Tkda6ou7XgAPLl0iBWfUyDY2pC2nDtwnXo12l/1gLjY=; b=ypiUoO0fpef4fbwKqOPzMmcb+yKgFV+PQEwYwc5e8aE2mCKnzRNnMKJCR0E7f6NTuz fTuqq69NhyACxm0VQfHS40Ly9XrzRQAGl+1kn4XAgUtUVbUkHna6nsvRj3Y/MxgJhF7P qXHXqHyrd8jU/vxg/LIEirYOxbwAbNkPTO9oM5GJoCaI6SSDm6F4wytSRdubb7lfeLoV cYLuNpCQCi9JXZtocU8Cbtp2jw2DtxmlqLomq6pATdV2aNv34RiBaXBJ15fxdmzBZsfs VUucM+Twpm7OgSGLULUNmBlEvuryHfknjT0ZN6xA5FBCQt8Fj5jqDBGOrAV5XadJroDd R+IA== X-Received: by 10.66.50.138 with SMTP id c10mr17092566pao.220.1364798223969; Sun, 31 Mar 2013 23:37:03 -0700 (PDT) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id 1sm12617386pba.32.2013.03.31.23.36.58 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 31 Mar 2013 23:37:02 -0700 (PDT) From: Prabhakar lad To: DLOS , LMML Cc: LKML , Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Sakari Ailus , "Lad, Prabhakar" , Sekhar Nori Subject: [PATCH v2] davinci: vpif: add pm_runtime support Date: Mon, 1 Apr 2013 12:06:50 +0530 Message-Id: <1364798210-31517-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. Signed-off-by: Lad, Prabhakar Cc: Mauro Carvalho Chehab Cc: Hans Verkuil Cc: Laurent Pinchart Cc: Sakari Ailus Cc: Sekhar Nori --- Changes for v2: 1: Removed use of clk API as pointed by Laurent and Sekhar. drivers/media/platform/davinci/vpif.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c index 28638a8..599cabb 100644 --- a/drivers/media/platform/davinci/vpif.c +++ b/drivers/media/platform/davinci/vpif.c @@ -23,8 +23,8 @@ #include #include #include -#include #include +#include #include #include @@ -44,7 +44,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 @@ -439,19 +438,15 @@ static int vpif_probe(struct platform_device *pdev) goto fail; } - vpif_clk = clk_get(&pdev->dev, "vpif"); - if (IS_ERR(vpif_clk)) { - status = PTR_ERR(vpif_clk); - goto clk_fail; - } - clk_prepare_enable(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"); return 0; -clk_fail: - iounmap(vpif_base); fail: release_mem_region(res->start, res_len); return status; @@ -459,11 +454,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 +462,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; }