From patchwork Tue Jun 7 11:19:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 69490 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1922629qgf; Tue, 7 Jun 2016 04:21:45 -0700 (PDT) X-Received: by 10.66.88.73 with SMTP id be9mr30242385pab.113.1465298499645; Tue, 07 Jun 2016 04:21:39 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d129si22783178pfa.184.2016.06.07.04.21.38; Tue, 07 Jun 2016 04:21:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754869AbcFGLVd (ORCPT + 31 others); Tue, 7 Jun 2016 07:21:33 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:35903 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754732AbcFGLVL (ORCPT ); Tue, 7 Jun 2016 07:21:11 -0400 Received: by mail-wm0-f46.google.com with SMTP id n184so132192417wmn.1 for ; Tue, 07 Jun 2016 04:21:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qvfT1C0C1meyY4SB7mtDwH0ySMicYpuLn5zVn0jDJKs=; b=iWsefyAeXKPxkukNbUwr2B2f7pkwyeOfflyFbRU6crR7QSNi1Ho8Nwsdz83KM+dmJl I6W9WlMCyOyxZXxxWtYRZm8/UlwZKYVmx3jvyVkFftUBfWQwAC1H7VjHborXtes3Ijm/ HNRHfuF17h9h+x+bAI+/SkYh0hR2t8M8PnUeY= 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=qvfT1C0C1meyY4SB7mtDwH0ySMicYpuLn5zVn0jDJKs=; b=OJfoimtGGnYx+z+UV+5G+BMhwkwn1eo0CR5msQNdM1xJFH3P1Pc5JdcgbZFjnlMIE1 YRP1epBOBG24Ymqpz7A7OFttEHXpqzLJMthtw5QkOHPVHg5qb4C3fM6ZWq/nN2mroAUD TabEdFq+84a6BK0hn2mrm0k/rEUziOZFu8dcElsNph03S97/Zsd7K9K+LU1HFAc5ye2s gP/5zzwXYGKoJIUrrWf3JHmsMb3msYVmkOJcB8Qk1iLuFWz967p8ZHbIkT5mgMkvnMKs T/Sp/d+72oVpLSU9ge5OL7adYRmeoMmUK8h1lsbiU53uJXrsJZVw53X7Imj6sSMV9bjA L0cA== X-Gm-Message-State: ALyK8tJM+/nehz2rjeH2P/gNZoDjtRaXrtklUNoQSFb1bZLmUtnfMRSyZVIGlUkfXz5HxqeZ X-Received: by 10.194.117.35 with SMTP id kb3mr2388193wjb.136.1465298465322; Tue, 07 Jun 2016 04:21:05 -0700 (PDT) Received: from localhost.localdomain (host81-129-171-215.range81-129.btcentralplus.com. [81.129.171.215]) by smtp.gmail.com with ESMTPSA id t199sm14466371wmt.11.2016.06.07.04.21.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jun 2016 04:21:04 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, maxime.coquelin@st.com, patrice.chotard@st.com, mturquette@baylibre.com, sboyd@codeaurora.org, broonie@kernel.org, linux-clk@vger.kernel.org, linux-spi@vger.kernel.org, Lee Jones Subject: [PATCH 6/6] spi: st-ssc4: Remove 'no clocking' hack Date: Tue, 7 Jun 2016 12:19:30 +0100 Message-Id: <20160607111930.10375-7-lee.jones@linaro.org> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160607111930.10375-1-lee.jones@linaro.org> References: <20160607111930.10375-1-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Due to the newly upstreamed 'critical clocks' API we can now safely handle clocking in the SPI and I2C drivers without fear of catastrophically crippling the running platform. Signed-off-by: Lee Jones --- drivers/spi/spi-st-ssc4.c | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) -- 2.8.3 Acked-by: Mark Brown diff --git a/drivers/spi/spi-st-ssc4.c b/drivers/spi/spi-st-ssc4.c index d5adf9f..a56eca0 100644 --- a/drivers/spi/spi-st-ssc4.c +++ b/drivers/spi/spi-st-ssc4.c @@ -68,32 +68,6 @@ struct spi_st { struct completion done; }; -static int spi_st_clk_enable(struct spi_st *spi_st) -{ - /* - * Current platforms use one of the core clocks for SPI and I2C. - * If we attempt to disable the clock, the system will hang. - * - * TODO: Remove this when platform supports power domains. - */ - return 0; - - return clk_prepare_enable(spi_st->clk); -} - -static void spi_st_clk_disable(struct spi_st *spi_st) -{ - /* - * Current platforms use one of the core clocks for SPI and I2C. - * If we attempt to disable the clock, the system will hang. - * - * TODO: Remove this when platform supports power domains. - */ - return; - - clk_disable_unprepare(spi_st->clk); -} - /* Load the TX FIFO */ static void ssc_write_tx_fifo(struct spi_st *spi_st) { @@ -349,7 +323,7 @@ static int spi_st_probe(struct platform_device *pdev) goto put_master; } - ret = spi_st_clk_enable(spi_st); + ret = clk_prepare_enable(spi_st->clk); if (ret) goto put_master; @@ -408,7 +382,7 @@ static int spi_st_probe(struct platform_device *pdev) return 0; clk_disable: - spi_st_clk_disable(spi_st); + clk_disable_unprepare(spi_st->clk); put_master: spi_master_put(master); return ret; @@ -419,7 +393,7 @@ static int spi_st_remove(struct platform_device *pdev) struct spi_master *master = platform_get_drvdata(pdev); struct spi_st *spi_st = spi_master_get_devdata(master); - spi_st_clk_disable(spi_st); + clk_disable_unprepare(spi_st->clk); pinctrl_pm_select_sleep_state(&pdev->dev); @@ -435,7 +409,7 @@ static int spi_st_runtime_suspend(struct device *dev) writel_relaxed(0, spi_st->base + SSC_IEN); pinctrl_pm_select_sleep_state(dev); - spi_st_clk_disable(spi_st); + clk_disable_unprepare(spi_st->clk); return 0; } @@ -446,7 +420,7 @@ static int spi_st_runtime_resume(struct device *dev) struct spi_st *spi_st = spi_master_get_devdata(master); int ret; - ret = spi_st_clk_enable(spi_st); + ret = clk_prepare_enable(spi_st->clk); pinctrl_pm_select_default_state(dev); return ret;