[PATCH] crypto: caam: check caam_emi_slow instead of re-lookup platform

Path	csiph.com!aioe.org!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	Marcus Folkesson <marcus.folkesson@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH] crypto: caam: check caam_emi_slow instead of re-lookup platform
Date	Mon, 28 Nov 2016 13:00:01 +0100
Message-ID	<sIsLf-1AV-7@gated-at.bofh.it> (permalink)
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=QB0zeWYeQtM7dYdOJV7G9HPOP5WmlqwfmzBfPsKjvmM=; b=ouIVFguu+h63OYaWPJl90plRfL+OV2hi40fCNE+FJtGrfNAe4eVuq1K7COIr5E4vFI r0ZvLq1yzjB5cXAoD+DYJdoI/wXr0KgXtRjcf2ZMz/6NGpWFXX3UznBdM5UXQ287NbjV 0ooFen6WNpLh4ywySZpZHCnp0CBkPM7/M1GvofzOU3Ga4/nMgEiPFTnqSYPk4/fLot9l mihYMOtOkR5TTauJ/tSmlA3RURxeR9iqSyuWcax3rYT7U6JYLBhsE4lslkMoB0zVM2X2 ut15pKU8xEXMB2Sfj4hk8dbhxqDPLaaScU5n8s3jk+0qPZjAgBkDexhFt4AFm2+w9lFi LjTQ==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=QB0zeWYeQtM7dYdOJV7G9HPOP5WmlqwfmzBfPsKjvmM=; b=AS62YlH8oLrU5khYwT6NJd+yDpQGC8L+MWtIA9Jv62hjt7ZuhDiX8GsSOC5fHoSiEY 6D5yMvkpXd8Aqgu555mqRWleQBMFntOoKyGDQmBSdHO2K0YqtsMZIqdxYD3fAM0FJcKk OeJ272AjzPHqH9KOLRW3d4qazBTDEmCMy2kXlwP6P502PMlcXAgog2oVD2VxXKh4w2bV SYIZAwnqAn40uHv7tMLIpfDpmG+qVtW7WW0NXlDll7zzxahL5X5In2pBtLN2nfFMgucp BSsVHEzT0kz1GVsprahZPIaAnkHPhPIqL76ymgM2hT2jaPdiv+0fVUwWbK36QXUp0eg+ c2nA==
X-Gm-Message-State	AKaTC01onv54zy/vBCnQHXTEZSjJAHxzrUtk9Waxg91/Kw9dpgdZa2XiXvR8mRQFl43Blw==
X-Received	by 10.98.71.93 with SMTP id u90mr21137044pfa.177.1480334019014; Mon, 28 Nov 2016 03:53:39 -0800 (PST)
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
User-Agent	Mutt/1.5.21 (2010-09-15)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	41
Organization	linux.* mail to news gateway
X-Original-Cc	linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Mon, 28 Nov 2016 12:53:28 -0500
X-Original-Message-ID	<20161128175328.GA29713@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1531241

Show key headers only | View raw

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---

Russel King, sorry, I did not see your comment until now.

 drivers/crypto/caam/ctrl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 5abaf3743b86..4993c90ceb3f 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -329,7 +329,7 @@ static int caam_remove(struct platform_device *pdev)
 	clk_disable_unprepare(ctrlpriv->caam_ipg);
 	clk_disable_unprepare(ctrlpriv->caam_mem);
 	clk_disable_unprepare(ctrlpriv->caam_aclk);
-	if (!of_machine_is_compatible("fsl,imx6ul"))
+	if (ctrlpriv->caam_emi_slow)
 		clk_disable_unprepare(ctrlpriv->caam_emi_slow);
 	return 0;
 }
@@ -511,7 +511,7 @@ static int caam_probe(struct platform_device *pdev)
 		goto disable_caam_mem;
 	}
 
-	if (!of_machine_is_compatible("fsl,imx6ul")) {
+	if (ctrlpriv->caam_emi_slow) {
 		ret = clk_prepare_enable(ctrlpriv->caam_emi_slow);
 		if (ret < 0) {
 			dev_err(&pdev->dev, "can't enable CAAM emi slow clock: %d\n",
@@ -833,7 +833,7 @@ caam_remove:
 iounmap_ctrl:
 	iounmap(ctrl);
 disable_caam_emi_slow:
-	if (!of_machine_is_compatible("fsl,imx6ul"))
+	if (ctrlpriv->caam_emi_slow)
 		clk_disable_unprepare(ctrlpriv->caam_emi_slow);
 disable_caam_aclk:
 	clk_disable_unprepare(ctrlpriv->caam_aclk);
-- 
2.11.0.rc2

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] crypto: caam: check caam_emi_slow instead of re-lookup  platform Marcus Folkesson <marcus.folkesson@gmail.com> - 2016-11-28 13:00 +0100

csiph-web