From patchwork Mon Oct 13 14:02:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5076701 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BC1639F387 for ; Mon, 13 Oct 2014 14:06:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF51720131 for ; Mon, 13 Oct 2014 14:06:34 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC2BA20123 for ; Mon, 13 Oct 2014 14:06:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XdgDv-0007oW-PD; Mon, 13 Oct 2014 14:03:43 +0000 Received: from mail-wi0-f182.google.com ([209.85.212.182]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XdgDB-0007Sd-MJ for linux-arm-kernel@lists.infradead.org; Mon, 13 Oct 2014 14:02:58 +0000 Received: by mail-wi0-f182.google.com with SMTP id n3so7532022wiv.9 for ; Mon, 13 Oct 2014 07:02:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o3j24SLU6UiBqvzb/byVRSBygeTuzk9IL6WP/7Kn414=; b=ACMPejw/RuRPeFHqCl3bEFYFPIauhBCAn7pFjp4nt8x/J0RTIU93EToZXvIHB1Xt0t NSc8MqraVJEsTOIfLzLMr3phVC/0NJzQarOYNgxnO6ifjjHOoTxp3hC6K8UjbotboJQi Botg6le7lN41IWsBrlbu9VMdhhDp8ZG7gHvNJzle3rbWbLP+Op1kfBSZkT5DGgFFis8T U45+2RMQwJ/9xY741sqP/OL08pEKIhXrz3uoaYrguEMo76iBq7PKM6H3f9PQmwHimIi/ xwgnjHt5sYpx9IsCbRVmpFpAOBxGw2xK6VjHFq5FUHYQBP9ffEheS0rvawnptf5XTFIP uj3g== X-Gm-Message-State: ALoCoQn9uFuvv6VQT0BFrqDvTF+zLy3ll8Dl1mRz3/5aQPFP5Qer/iyEZtQV0V1GhsFn+S7E1/VO X-Received: by 10.180.188.102 with SMTP id fz6mr870332wic.61.1413208955420; Mon, 13 Oct 2014 07:02:35 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fq1sm1533474wib.12.2014.10.13.07.02.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Oct 2014 07:02:34 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Subject: [PATCH v3 3/9] amba: Keep PM domain powered during ->probe() Date: Mon, 13 Oct 2014 16:02:04 +0200 Message-Id: <1413208930-26019-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413208930-26019-1-git-send-email-ulf.hansson@linaro.org> References: <1413208930-26019-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141013_070257_943261_EE031D64 X-CRM114-Status: GOOD ( 12.86 ) X-Spam-Score: -0.7 (/) Cc: Simon Horman , Ulf Hansson , Kevin Hilman , Russell King , Philipp Zabel , Geert Uytterhoeven , Wolfram Sang , Greg Kroah-Hartman , Mark Brown , Dmitry Torokhov , Magnus Damm , Tomasz Figa , linux-samsung-soc@vger.kernel.org, Alan Stern , Ben Dooks , Jinkun Hong , Kukjin Kim , Sylwester Nawrocki , Aaron Lu , Jack Dai , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To sucessfully probe some devices their corresponding PM domains may need to be powered. Use the dev_pm_domain_get|put() APIs, to control the behavior of the PM domain. Signed-off-by: Ulf Hansson --- drivers/amba/bus.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 47bbdc1..a8a8e13 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -187,8 +187,15 @@ static int amba_probe(struct device *dev) if (ret == -EPROBE_DEFER) break; + ret = dev_pm_domain_get(dev->pm_domain); + if (ret) { + dev_pm_domain_detach(dev, true); + break; + } + ret = amba_get_enable_pclk(pcdev); if (ret) { + dev_pm_domain_put(dev->pm_domain); dev_pm_domain_detach(dev, true); break; } @@ -198,6 +205,7 @@ static int amba_probe(struct device *dev) pm_runtime_enable(dev); ret = pcdrv->probe(pcdev, id); + dev_pm_domain_put(dev->pm_domain); if (ret == 0) break;