From patchwork Mon Jan 19 13:22:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 43308 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EBEE92410B for ; Mon, 19 Jan 2015 13:23:13 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id w7sf16931346lbi.0 for ; Mon, 19 Jan 2015 05:23:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=nECWMEwRjSDdjSpsM5qW+G9P98oanqJS4kIATsi+Xh4=; b=KSFJxbIEDnOO3CRZJxfzTtq19KMNIMbYuzT6z79Wtx6h5Ujwbl7dam+rTlxenLDWuo Akvf1fJ1Q62wb13Emjb6/3OHfpQuMY4uElyuzzUst8WqsATSGN9f5lmpW5u2awRQfe/K xhBkuq5Lf+U24i0Hn/nJe9IG+xOeQlr1NpliFaH50rqWoiJUkAsKxw1bNdCjKUeVvvqI OXol+Ug7U5lJ/VZsKrB5hdBsQCaU0+tt4keDZI82Sjr+79HbC53stNezPNUmi1L920uB flcIYzZxrIVYdX8aRyqwP69MMP2tn6deElARTVPdFjmpT6uOOwjNGYdoHuD4zbo/7aiL tuWw== X-Gm-Message-State: ALoCoQlauQUkbCCOFepzkpaSLnhd+RtdT4QmFp3kxx4b7L09W3Eho2WYUfvkkVeVqZ0XJ2P444C0 X-Received: by 10.180.92.66 with SMTP id ck2mr1860728wib.3.1421673792584; Mon, 19 Jan 2015 05:23:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.104 with SMTP id x8ls628453laj.4.gmail; Mon, 19 Jan 2015 05:23:12 -0800 (PST) X-Received: by 10.112.25.7 with SMTP id y7mr30679896lbf.94.1421673792350; Mon, 19 Jan 2015 05:23:12 -0800 (PST) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id e10si11472313lbp.129.2015.01.19.05.23.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 19 Jan 2015 05:23:10 -0800 (PST) Received-SPF: temperror (google.com: error in processing during lookup of patch+caf_=patchwork-forward=linaro.org@linaro.org: DNS timeout) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id z12so7475920lbi.7 for ; Mon, 19 Jan 2015 05:23:10 -0800 (PST) X-Received: by 10.112.41.234 with SMTP id i10mr31395185lbl.25.1421673790212; Mon, 19 Jan 2015 05:23:10 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.9.200 with SMTP id c8csp1089754lbb; Mon, 19 Jan 2015 05:23:09 -0800 (PST) X-Received: by 10.112.132.2 with SMTP id oq2mr31006825lbb.11.1421673784536; Mon, 19 Jan 2015 05:23:04 -0800 (PST) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id jb3si11530883lbc.79.2015.01.19.05.23.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 19 Jan 2015 05:23:02 -0800 (PST) Received-SPF: temperror (google.com: error in processing during lookup of ulf.hansson@linaro.org: DNS timeout) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id hv19so1278161lab.6 for ; Mon, 19 Jan 2015 05:23:02 -0800 (PST) X-Received: by 10.112.162.4 with SMTP id xw4mr30411051lbb.89.1421673780050; Mon, 19 Jan 2015 05:23:00 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id v4sm3080344lbz.12.2015.01.19.05.22.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Jan 2015 05:22:58 -0800 (PST) From: Ulf Hansson To: Mauro Carvalho Chehab , linux-media@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, Kukjin Kim , Sylwester Nawrocki , Kyungmin Park , Ulf Hansson Subject: [PATCH V2 3/8] [media] exynos-gsc: Make driver functional when CONFIG_PM is unset Date: Mon, 19 Jan 2015 14:22:35 +0100 Message-Id: <1421673760-2600-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421673760-2600-1-git-send-email-ulf.hansson@linaro.org> References: <1421673760-2600-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=temperror (google.com: error in processing during lookup of patch+caf_=patchwork-forward=linaro.org@linaro.org: DNS timeout) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The driver depended on CONFIG_PM to be functional. Let's remove that dependency, by enable the runtime PM resourses during ->probe() and update the device's runtime PM status to reflect this. Signed-off-by: Ulf Hansson --- drivers/media/platform/exynos-gsc/gsc-core.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c index 1865738..532daa8 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/drivers/media/platform/exynos-gsc/gsc-core.c @@ -1088,7 +1088,7 @@ static int gsc_probe(struct platform_device *pdev) return PTR_ERR(gsc->clock); } - ret = clk_prepare(gsc->clock); + ret = clk_prepare_enable(gsc->clock); if (ret) { dev_err(&gsc->pdev->dev, "clock prepare failed for clock: %s\n", GSC_CLOCK_GATE_NAME); @@ -1111,30 +1111,29 @@ static int gsc_probe(struct platform_device *pdev) goto err_v4l2; platform_set_drvdata(pdev, gsc); - pm_runtime_enable(dev); - ret = pm_runtime_get_sync(&pdev->dev); - if (ret < 0) - goto err_m2m; + + gsc_hw_set_sw_reset(gsc); + gsc_wait_reset(gsc); /* Initialize continious memory allocator */ gsc->alloc_ctx = vb2_dma_contig_init_ctx(dev); if (IS_ERR(gsc->alloc_ctx)) { ret = PTR_ERR(gsc->alloc_ctx); - goto err_pm; + goto err_m2m; } dev_dbg(dev, "gsc-%d registered successfully\n", gsc->id); - pm_runtime_put(dev); + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + return 0; -err_pm: - pm_runtime_put(dev); err_m2m: gsc_unregister_m2m_device(gsc); err_v4l2: v4l2_device_unregister(&gsc->v4l2_dev); err_clk: - clk_unprepare(gsc->clock); + clk_disable_unprepare(gsc->clock); return ret; }