From patchwork Wed Sep 11 15:32:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Westerberg X-Patchwork-Id: 2873311 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 BC7B39F495 for ; Wed, 11 Sep 2013 15:40:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 229F920284 for ; Wed, 11 Sep 2013 15:40:54 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C4CE2025D for ; Wed, 11 Sep 2013 15:40:49 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJmVY-0005gj-JS; Wed, 11 Sep 2013 15:39:09 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJmQc-0000k7-K5; Wed, 11 Sep 2013 15:34:02 +0000 Received: from mga02.intel.com ([134.134.136.20]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJmQ1-0000c7-Ob for linux-arm-kernel@lists.infradead.org; Wed, 11 Sep 2013 15:33:27 +0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 11 Sep 2013 08:32:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.90,885,1371106800"; d="scan'208";a="376662253" Received: from blue.fi.intel.com ([10.237.72.156]) by orsmga001.jf.intel.com with ESMTP; 11 Sep 2013 08:32:47 -0700 Received: by blue.fi.intel.com (Postfix, from userid 1004) id 34250E0099; Wed, 11 Sep 2013 18:32:41 +0300 (EEST) From: Mika Westerberg To: linux-i2c@vger.kernel.org Subject: [PATCH v2 9/9] spi: attach/detach SPI device to the ACPI power domain Date: Wed, 11 Sep 2013 18:32:40 +0300 Message-Id: <1378913560-2752-10-git-send-email-mika.westerberg@linux.intel.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1378913560-2752-1-git-send-email-mika.westerberg@linux.intel.com> References: <1378913560-2752-1-git-send-email-mika.westerberg@linux.intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130911_113326_000624_455BBCFF X-CRM114-Status: GOOD ( 16.12 ) X-Spam-Score: -7.7 (-------) Cc: Aaron Lu , Dmitry Torokhov , Mika Westerberg , Samuel Ortiz , Arnd Bergmann , Wolfram Sang , Greg Kroah-Hartman , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, Liam Girdwood , linux-acpi@vger.kernel.org, Kyungmin Park , Mark Brown , Lv Zheng , Lee Jones , linux-arm-kernel@lists.infradead.org, Mauro Carvalho Chehab X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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=-5.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 If the SPI device is enumerated from ACPI namespace (it has an ACPI handle) it might have ACPI methods that needs to be called in order to transition the device to different power states (such as _PSx). We follow what has been done for platform and I2C buses here and attach the SPI device to the ACPI power domain if the device has an ACPI handle. This makes sure that the device is powered on when its ->probe() is called. For non-ACPI devices this patch is a no-op. Signed-off-by: Mika Westerberg Acked-by: Mark Brown --- drivers/spi/spi.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 94ebab9..cac0ca2 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -246,6 +246,9 @@ static int spi_drv_probe(struct device *dev) /* Make sure that the master is powered on */ pm_runtime_get_sync(&spi->master->dev); + if (ACPI_HANDLE(&spi->dev)) + acpi_dev_pm_attach(&spi->dev, true); + /* * Enable runtime PM for the SPI device. The SPI device driver can * participate in runtime PM by calling pm_runtime_put() in its @@ -260,6 +263,9 @@ static int spi_drv_probe(struct device *dev) pm_runtime_disable(&spi->dev); pm_runtime_set_suspended(&spi->dev); pm_runtime_put_noidle(&spi->dev); + + if (ACPI_HANDLE(&spi->dev)) + acpi_dev_pm_detach(&spi->dev, true); } pm_runtime_put(&spi->master->dev); @@ -282,6 +288,9 @@ static int spi_drv_remove(struct device *dev) pm_runtime_set_suspended(&spi->dev); pm_runtime_put_noidle(&spi->dev); + if (ACPI_HANDLE(&spi->dev)) + acpi_dev_pm_detach(&spi->dev, true); + pm_runtime_put(&spi->master->dev); return ret;