From patchwork Fri Jan 26 17:00:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 126002 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp471462ljd; Fri, 26 Jan 2018 09:00:32 -0800 (PST) X-Google-Smtp-Source: AH8x2272dHvuJeJovjKYRxhlUeizonqsYGsmW6qD4cOW8la+vomEpFu+lAWeyDX5/RddTj7F56Ha X-Received: by 2002:a17:902:28a4:: with SMTP id f33-v6mr11708280plb.192.1516986032431; Fri, 26 Jan 2018 09:00:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516986032; cv=none; d=google.com; s=arc-20160816; b=ncM5Ju+fipovL+egqDt8W0WC42Vhyrpg+lBsvaQKcoIBxVVc1zTSO/0JwLOLK9dl6R CihtTfsV7cEFpJNmRx8voGmsDR6ZUpde8ucB+dGD27hN7iyIClNJUKAun3mNyuMlfnwT 9LxkpyNxGK1x+iCOXbagJM14egtWwofeSy8YenaWXQQrDdLnaM+Si9N9ZIYDgLa289MS XwCel7AqIZMpJhLr0bNwLzItI9xmpWEPq4fEIiQAhotII+0NxmwMjz1ZMhdAl8zmDXKK +UAFg4atYxdWcEHBicEwpzAQhNPsqOAGShBUqqX6tJHHeVIdCYAQXB2ynGhtALLdf0xK UPSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=FkE46eBYH4V9rjjav76nxvHFo1Xp5vkKLwovWrTD7bM=; b=VNpQQqvPMItz39YZCpSz639rQTs1uM4y/sRS9v8B5V9DyU5r3pNvlKk6rP7RnUhQj3 ZfNsihqDl1D8tvRVqLVjRttxdBXwTyBzjSM17SQ6mga2KQdCZX49ODvY3Fp55tw/s//h qvZm8XGZJ7SFGMQrWVg243mrnBbQGPPNnoyvmCKldMTAqvu4lgI1iuZul+3UVwLCv7eA V+IEw1gLvLLbDq+AQ2bLynmXzQM6egkweUYBrTTRNIwr7BbrlM15A+0WGO66ugkcN1I3 ihx8I8E9N1KH/Q5tNVbZ+bJ8LVegIVhbJg0FUE5MoWUEaenNCe4HSSS2jKKGrR6lu8XF d2nA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nexus-software-ie.20150623.gappssmtp.com header.s=20150623 header.b=ksTe0fjd; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u6-v6si3890563pls.653.2018.01.26.09.00.32; Fri, 26 Jan 2018 09:00:32 -0800 (PST) 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=@nexus-software-ie.20150623.gappssmtp.com header.s=20150623 header.b=ksTe0fjd; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752216AbeAZRAQ (ORCPT + 26 others); Fri, 26 Jan 2018 12:00:16 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34885 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752010AbeAZRAL (ORCPT ); Fri, 26 Jan 2018 12:00:11 -0500 Received: by mail-wm0-f65.google.com with SMTP id r78so22557172wme.0 for ; Fri, 26 Jan 2018 09:00:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nexus-software-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FkE46eBYH4V9rjjav76nxvHFo1Xp5vkKLwovWrTD7bM=; b=ksTe0fjdyt2T+ej69UQWaj6CbADlJ0GYgV9Hw2agDySTudeoKsbUUV7/4DkOORhkeg RDHcgeEVibkyZ8OrNE84UEk2Wbl41ptSA7jkoIOEDEo0LccM7LF5pGh5ZQBUx9iXoaJE cKJdp+iv9ShhPu2mviPk6OPR+Ey63TovVm9jlTcGCZtSS/WannsaauKnvbkHVyChvJKY 4lazb86WSD3EvQG3eK6UAT0Gq43KF1di6HiYaRWqOArrxBFlveWOzIMITwUTT/DqoMe9 /KPgQWYYbbsQFcwuhlO45lz4DS5o8+yaFvvFajO3jr2M4wMjzIN5zHFYCi0h/BNl5ZSN 7jBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FkE46eBYH4V9rjjav76nxvHFo1Xp5vkKLwovWrTD7bM=; b=VRCs5qmF3mUb29B41OtDzf70IgPgFI9hbT4BMiPJUyCeFJFa8/Q/r0jqNgLfEBNFz9 Hcj76OHzT3XgHV5YKChrlDUiDXHOCcnHGaAulCYx+KSepHjT/twW6FlC6fWYJDJN5kBE yMKG4Pb/kAN5BnT7cSwfeip//tzLWqHINI4ETj58dl8tzjYj5oZEYxofS3fHlFofhrMg 7nyIbYgDODH3RYvNXqoloP/W28IgmFAN1EqpdYGtYyKnk0uw/pn3Yt7NPveCGGLt3ePD zubR3iKGqlp6R4Wxl6KEDSR+bEakXipUUjwmFs0G6I7tOOhhVqi/tahxNNc1Tzb38aGO EGYg== X-Gm-Message-State: AKwxyteX8NgTmQSmTNJPVte+JEb1YkmjeyIFFegipbdqYJGXDuP8++i2 qUNQaA6iGTv02w4jeSztaf16YQ== X-Received: by 10.80.244.23 with SMTP id r23mr34188059edm.2.1516986009667; Fri, 26 Jan 2018 09:00:09 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id d21sm2733949edb.13.2018.01.26.09.00.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Jan 2018 09:00:09 -0800 (PST) From: Bryan O'Donoghue To: horia.geanta@nxp.com, aymen.sghaier@nxp.com, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Cc: fabio.estevam@nxp.com, peng.fan@nxp.com, herbert@gondor.apana.org.au, davem@davemloft.net, lukas.auer@aisec.fraunhofer.de, rui.silva@linaro.org, ryan.harkin@linaro.org, Bryan O'Donoghue Subject: [PATCH v2 3/5] crypto: caam: do not use mem and emi_slow clock for imx7x Date: Fri, 26 Jan 2018 17:00:02 +0000 Message-Id: <1516986004-25452-4-git-send-email-pure.logic@nexus-software.ie> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516986004-25452-1-git-send-email-pure.logic@nexus-software.ie> References: <1516986004-25452-1-git-send-email-pure.logic@nexus-software.ie> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rui Miguel Silva I.MX7x only use two clocks for the CAAM module, so make sure we do not try to use the mem and the emi_slow clock when running in that imx7d and imx7s machine type. [bod: fixed minor trailing whitespace issue] Signed-off-by: Rui Miguel Silva Cc: "Horia Geantă" Cc: Aymen Sghaier Cc: Fabio Estevam Cc: Peng Fan Cc: Herbert Xu Cc: "David S. Miller" Cc: Lukas Auer Signed-off-by: Bryan O'Donoghue --- drivers/crypto/caam/ctrl.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) -- 2.7.4 diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 0a1e96b..1f2dd6a 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -333,7 +333,8 @@ static int caam_remove(struct platform_device *pdev) /* shut clocks off before finalizing shutdown */ clk_disable_unprepare(ctrlpriv->caam_ipg); - clk_disable_unprepare(ctrlpriv->caam_mem); + if (ctrlpriv->caam_mem) + clk_disable_unprepare(ctrlpriv->caam_mem); clk_disable_unprepare(ctrlpriv->caam_aclk); if (ctrlpriv->caam_emi_slow) clk_disable_unprepare(ctrlpriv->caam_emi_slow); @@ -462,14 +463,17 @@ static int caam_probe(struct platform_device *pdev) } ctrlpriv->caam_ipg = clk; - clk = caam_drv_identify_clk(&pdev->dev, "mem"); - if (IS_ERR(clk)) { - ret = PTR_ERR(clk); - dev_err(&pdev->dev, - "can't identify CAAM mem clk: %d\n", ret); - return ret; + if (!of_machine_is_compatible("fsl,imx7d") && + !of_machine_is_compatible("fsl,imx7s")) { + clk = caam_drv_identify_clk(&pdev->dev, "mem"); + if (IS_ERR(clk)) { + ret = PTR_ERR(clk); + dev_err(&pdev->dev, + "can't identify CAAM mem clk: %d\n", ret); + return ret; + } + ctrlpriv->caam_mem = clk; } - ctrlpriv->caam_mem = clk; clk = caam_drv_identify_clk(&pdev->dev, "aclk"); if (IS_ERR(clk)) { @@ -480,7 +484,9 @@ static int caam_probe(struct platform_device *pdev) } ctrlpriv->caam_aclk = clk; - if (!of_machine_is_compatible("fsl,imx6ul")) { + if (!of_machine_is_compatible("fsl,imx6ul") && + !of_machine_is_compatible("fsl,imx7d") && + !of_machine_is_compatible("fsl,imx7s")) { clk = caam_drv_identify_clk(&pdev->dev, "emi_slow"); if (IS_ERR(clk)) { ret = PTR_ERR(clk); @@ -497,11 +503,13 @@ static int caam_probe(struct platform_device *pdev) return ret; } - ret = clk_prepare_enable(ctrlpriv->caam_mem); - if (ret < 0) { - dev_err(&pdev->dev, "can't enable CAAM secure mem clock: %d\n", - ret); - goto disable_caam_ipg; + if (ctrlpriv->caam_mem) { + ret = clk_prepare_enable(ctrlpriv->caam_mem); + if (ret < 0) { + dev_err(&pdev->dev, "can't enable CAAM secure mem clock: %d\n", + ret); + goto disable_caam_ipg; + } } ret = clk_prepare_enable(ctrlpriv->caam_aclk); @@ -823,7 +831,8 @@ static int caam_probe(struct platform_device *pdev) disable_caam_aclk: clk_disable_unprepare(ctrlpriv->caam_aclk); disable_caam_mem: - clk_disable_unprepare(ctrlpriv->caam_mem); + if (ctrlpriv->caam_mem) + clk_disable_unprepare(ctrlpriv->caam_mem); disable_caam_ipg: clk_disable_unprepare(ctrlpriv->caam_ipg); return ret; From patchwork Fri Jan 26 17:00:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 126001 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp471286ljd; Fri, 26 Jan 2018 09:00:21 -0800 (PST) X-Google-Smtp-Source: AH8x226YZk/XWA48JZXLzmOCBYdEnFCA+r/q7SFU6p/YnnaXxDLKwwrDhcf0Nvb1sT+XUYl1Rv1s X-Received: by 10.101.80.204 with SMTP id s12mr4116871pgp.185.1516986020991; Fri, 26 Jan 2018 09:00:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516986020; cv=none; d=google.com; s=arc-20160816; b=CRu6zF4ATuf2iXBCUFeCYfWwX4vAMKOmtwS4xS2SFzQadAdjLNUc1b3HYjEiFML3BG T2wOEzg/PP8y3BOzrqidw5TI8hY8B9mlALN9voB0Exz2QcIjCk40dIfp2JdCu9vimrPR 6kUHNyoiTPqUAR0ZIljoQQlN5WfoZ189yG7NrAoID0j1jH+r+RBIPiB3pXhXSwIcPItl OvAGx5/hwLfVxFukh0X+qpRUsxv+ecwxf6oLe5mU9iwTLfhJVFThDzji97d44Oms76Wa XM1LsTJf0Hi005dsJ5q1JSFo1MWdKK54QUmn4lfjLjDN00HuLBtGCwhb4jrw/zMslEuE LjJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=5PaYhwZjTrX1sjZ+sz+J4G5srqu0tAqo0PilClBBBXk=; b=RrnsupSLD3Z2vATI1stvhoXeYn+psEZNZUq95MmEelwdUJ8aL6B3v8mt0jDiYThaUD G4H+ffHapu/DMK7OQYxxn/JqgD3ynHLAF2ZDUYj4TJ+ml1ZZsvy4ZaduzatpK2iQT2ik N4OtGks2Gy6aUB6FqI23gChd9P8bHUR0Y9z3Aloiy7iskN6W+Zwk5t1B1Tb/Lf45FyY/ B2IWVjhf1RwdDwKDGcyC6YvJvcA/i6JTV+JprwfplwBEAukqi2udyKZhV6uNZSwOIdD3 n4LOFKGmcnm+5JOELOxiAA9ARG8mjFP8uGjTPTXmYM8pBuhbRucclYQYaJmKHRGzMRkq IJlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nexus-software-ie.20150623.gappssmtp.com header.s=20150623 header.b=AJaq98OG; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k91-v6si3311635pld.495.2018.01.26.09.00.20; Fri, 26 Jan 2018 09:00:20 -0800 (PST) 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=@nexus-software-ie.20150623.gappssmtp.com header.s=20150623 header.b=AJaq98OG; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752317AbeAZRAS (ORCPT + 26 others); Fri, 26 Jan 2018 12:00:18 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:56234 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752023AbeAZRAL (ORCPT ); Fri, 26 Jan 2018 12:00:11 -0500 Received: by mail-wm0-f67.google.com with SMTP id 143so2567501wma.5 for ; Fri, 26 Jan 2018 09:00:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nexus-software-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5PaYhwZjTrX1sjZ+sz+J4G5srqu0tAqo0PilClBBBXk=; b=AJaq98OGYxO4mTuYKTA4LuSX6IpNNWQP47GfGQ+o6vxtIHzDYF/yCah3Q8N7kPL/kv 3KSLjzVNqsCXeMSieiZNnbqIvxQHzJOTwcyH1wMK6fnaC2Je+24H2shMw40D0DkP7y7T CdVK1sduudxgXzp3RS0gHRwAV2O/FFs2OtJWOdC2QAXPQTABG1P6LUUnYFrvluHSpAPF pXfyAoqW64H60LY86Pk93aCj/nEv+dkVb5HAFJFHMH5t6PpOrRJky6Jj91uwB6WVuEaY K5bLNVNUHJgHD3EvFdHSPkZhKIZrRa6e1XNFqIZF34sR7ICsEF6/byLJzIqk3eEyKOoX hdfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5PaYhwZjTrX1sjZ+sz+J4G5srqu0tAqo0PilClBBBXk=; b=UP20PY839gCqN4fDtlEy1/OXulFDrHElCoQHV9357VYt4XeGj76sneMF8Yxtzg5GT5 IF//9SOAjtq7BreOjheYOREjkrBxE16hPgSiiZhm5lDvkPdU4jF5gBcCDJz4pMJXZ5Ib X0BaJHiax2m+Yy6aAjL1y+lireifHEbTYXmI49V6ZbfdoRCi2L1cmqF7QQyvrqPHirBR rupJDv+jE/YhL0gaZ45cXXnYEmDJra95kpPmRea8NcDYKB0LZwkwT2Su3b1lqf0x1ibd PUMGaXe3MGzPjXpvWBOoQ1DZ5i2K99uqbmy8NkK5JoWxnk4b10RkaODcNV/3vPXj4k/g uC7A== X-Gm-Message-State: AKwxytcA22uz/OG4Ht977MGXDb+flb9YagBd9FRTgcsCO+1qZsMo9Qez VctU9DwDZF6I0phzLxIpntVOzw== X-Received: by 10.80.169.116 with SMTP id m49mr35707857edc.212.1516986010748; Fri, 26 Jan 2018 09:00:10 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id d21sm2733949edb.13.2018.01.26.09.00.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Jan 2018 09:00:10 -0800 (PST) From: Bryan O'Donoghue To: horia.geanta@nxp.com, aymen.sghaier@nxp.com, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Cc: fabio.estevam@nxp.com, peng.fan@nxp.com, herbert@gondor.apana.org.au, davem@davemloft.net, lukas.auer@aisec.fraunhofer.de, rui.silva@linaro.org, ryan.harkin@linaro.org, Bryan O'Donoghue Subject: [PATCH v2 4/5] clk: imx7d: add CAAM clock Date: Fri, 26 Jan 2018 17:00:03 +0000 Message-Id: <1516986004-25452-5-git-send-email-pure.logic@nexus-software.ie> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516986004-25452-1-git-send-email-pure.logic@nexus-software.ie> References: <1516986004-25452-1-git-send-email-pure.logic@nexus-software.ie> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rui Miguel Silva Add CAAM clock so that we could use the Cryptographic Acceleration and Assurance Module (CAAM) hardware block. Signed-off-by: Rui Miguel Silva Cc: "Horia Geantă" Cc: Aymen Sghaier Cc: Fabio Estevam Cc: Peng Fan Cc: Herbert Xu Cc: "David S. Miller" Cc: Lukas Auer Signed-off-by: Bryan O'Donoghue --- drivers/clk/imx/clk-imx7d.c | 1 + include/dt-bindings/clock/imx7d-clock.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c index 80dc211..52ab096 100644 --- a/drivers/clk/imx/clk-imx7d.c +++ b/drivers/clk/imx/clk-imx7d.c @@ -795,6 +795,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_DRAM_PHYM_ALT_ROOT_CLK] = imx_clk_gate4("dram_phym_alt_root_clk", "dram_phym_alt_post_div", base + 0x4130, 0); clks[IMX7D_DRAM_ALT_ROOT_CLK] = imx_clk_gate4("dram_alt_root_clk", "dram_alt_post_div", base + 0x4130, 0); clks[IMX7D_OCOTP_CLK] = imx_clk_gate4("ocotp_clk", "ipg_root_clk", base + 0x4230, 0); + clks[IMX7D_CAAM_CLK] = imx_clk_gate4("caam_clk", "ipg_root_clk", base + 0x4240, 0); clks[IMX7D_USB_HSIC_ROOT_CLK] = imx_clk_gate4("usb_hsic_root_clk", "usb_hsic_post_div", base + 0x4420, 0); clks[IMX7D_SDMA_CORE_CLK] = imx_clk_gate4("sdma_root_clk", "ahb_root_clk", base + 0x4480, 0); clks[IMX7D_PCIE_CTRL_ROOT_CLK] = imx_clk_gate4("pcie_ctrl_root_clk", "pcie_ctrl_post_div", base + 0x4600, 0); diff --git a/include/dt-bindings/clock/imx7d-clock.h b/include/dt-bindings/clock/imx7d-clock.h index e2f99ae..2bc5618 100644 --- a/include/dt-bindings/clock/imx7d-clock.h +++ b/include/dt-bindings/clock/imx7d-clock.h @@ -452,5 +452,6 @@ #define IMX7D_OCOTP_CLK 439 #define IMX7D_NAND_RAWNAND_CLK 440 #define IMX7D_NAND_USDHC_BUS_RAWNAND_CLK 441 -#define IMX7D_CLK_END 442 +#define IMX7D_CAAM_CLK 442 +#define IMX7D_CLK_END 443 #endif /* __DT_BINDINGS_CLOCK_IMX7D_H */ From patchwork Fri Jan 26 17:00:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 126003 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp471721ljd; Fri, 26 Jan 2018 09:00:48 -0800 (PST) X-Google-Smtp-Source: AH8x226ccs5eCkwDbrCm9esZtT5l1ZqKyHSzn8u4/61QYBkqhLEiiQbEgExSc+Sk5/8d6OVEtv1s X-Received: by 10.98.133.93 with SMTP id u90mr20049715pfd.134.1516986048170; Fri, 26 Jan 2018 09:00:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516986048; cv=none; d=google.com; s=arc-20160816; b=CRkfao1QJZlGNwgiJcLDWSXJkmpaVj6B2xqnqIdFYuZsY+C1MF0FZP4yIO7rMBEkEp Jwtp7zPBr5qcp6MM8Bo7qLfVK0+qP1PVoRTshShfFP37HexfltgKGCuQumEqptCEAkWM qHxgEkwq8LytKwoHhYakWFc+8L83N33WvuW2M3YEt0rlzT2vjmGm4ShNElUHzWe7+hkp bWqi+twLO2UDJ432K3sg4us191bUQWTFv0Y/S7Q7A9NSvwX6QT8lNsTVtC/H5duYDS18 8KiOs0vH1gn9JAsKdsBKmVRQEdmrsWSTpasOvViu8+zgWM9p9vOxH1e5NOBgcMCoiIml MFPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=TLXNkwel4V5CtLbBYRdFgURaK4Ji4Lu8UDMfcv0bMRA=; b=roc13C4lQKlPfYRVQ/+fImDEBUMt/i7e1i64v2eNtB4BmZgV5G/EtyrPkYddB51guo XO5Rp+3bOO6OGbIaA80O/GUeu7ad4LlmqhWeFfOniiqg5ZS7Z649HqYX4zN493irOauW CjxxSFyXqKz2k17DPv4bFqoTwy3d6VT2j8qgmfcBW6dqXNEbEVcMEo0tPvzQeEq8jLwI ToD/AXPsQlYeQ5rw9F2C7PhaZYnz10lh7qnK27rWsrL1e/oCwhlVLoQ9tx2Nyhx0PJuX E11MUdGNl+dw82mSwonPUhDq++G7Yje5yW0vp56bQA4yHjQBDsCoWBs89NwRdaU2XHU4 RQVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nexus-software-ie.20150623.gappssmtp.com header.s=20150623 header.b=08SAmhL5; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u6-v6si3890563pls.653.2018.01.26.09.00.47; Fri, 26 Jan 2018 09:00:48 -0800 (PST) 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=@nexus-software-ie.20150623.gappssmtp.com header.s=20150623 header.b=08SAmhL5; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752470AbeAZRAq (ORCPT + 26 others); Fri, 26 Jan 2018 12:00:46 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34895 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752029AbeAZRAN (ORCPT ); Fri, 26 Jan 2018 12:00:13 -0500 Received: by mail-wm0-f66.google.com with SMTP id r78so22557446wme.0 for ; Fri, 26 Jan 2018 09:00:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nexus-software-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TLXNkwel4V5CtLbBYRdFgURaK4Ji4Lu8UDMfcv0bMRA=; b=08SAmhL5hrcsvyn5FIyYQ/8XCLrhnPoJO0VYqswa3NffZBeUmZVwfa2Bl8bkNFOyU2 73yKucy26p5rC2O9cS9Z1RmTCbC578fD9G9PlxTF5qumoXV8VDtQAwMOSs6Wl3i0pO4L mbV+nMkLgXf0np6qQTzXn18AApmrm34AC8k6Ci2lKUsc9X9yVXV7BwjvGKTazWSdfi/J uzxcO+2mE5IHS6wz7kGaJkCjFWz13IEk9yic/fle97wDSH0ncQteSzJZxalUmghndZZn s6WrmO1Ecy+cnx2stwrK7tLKXAnk7HfkK+ESbDEqPfw1kEQunYet1HMNvv3OWzi3HCMG zsMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TLXNkwel4V5CtLbBYRdFgURaK4Ji4Lu8UDMfcv0bMRA=; b=kZ6L3lu29ul8qRwVfRu3HbnZ7rSzfbpnOhsm6igz4XzTsYD8LxSEAvzBD4lTa0VPn0 AYHMUh2dCUYI/Pt7OK4z8Ht0Cpi0rVwoSi86/Yb5epkWGVHXC7XO+GX+nbdR7tEKJy58 SjazLWxOuqDIxR8EBH/gD0w0s/NaD2L5vCh9IPHKJn3k/5LZ3iHld+8/IAaD0gEqAFlH 0t663/0eF7z5l4HyHsV1spTROndPF1cOPIAUkGhvU9YC2/VPRW+KullzYZWfZKVcn/9C rGAlU3F+m9me9mN0q7aJsQXykdTDTkeMG/4m0EzclfRhLFVa5ZpEMn41HlthZty7nNnK SzcA== X-Gm-Message-State: AKwxytdwUHLM3BF0uGrmhANzC0dHFsii9K0vISmJNwY2ho2jaOl/9hFD 1Uv7tDQXJT2/Bj1lllpjYlR8ug== X-Received: by 10.80.200.139 with SMTP id d11mr35241891edh.199.1516986011979; Fri, 26 Jan 2018 09:00:11 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id d21sm2733949edb.13.2018.01.26.09.00.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Jan 2018 09:00:11 -0800 (PST) From: Bryan O'Donoghue To: horia.geanta@nxp.com, aymen.sghaier@nxp.com, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Cc: fabio.estevam@nxp.com, peng.fan@nxp.com, herbert@gondor.apana.org.au, davem@davemloft.net, lukas.auer@aisec.fraunhofer.de, rui.silva@linaro.org, ryan.harkin@linaro.org, Bryan O'Donoghue Subject: [PATCH v2 5/5] ARM: dts: imx7s: add CAAM device node Date: Fri, 26 Jan 2018 17:00:04 +0000 Message-Id: <1516986004-25452-6-git-send-email-pure.logic@nexus-software.ie> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516986004-25452-1-git-send-email-pure.logic@nexus-software.ie> References: <1516986004-25452-1-git-send-email-pure.logic@nexus-software.ie> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rui Miguel Silva Add CAAM device node to the i.MX7s device tree. Signed-off-by: Rui Miguel Silva Cc: "Horia Geantă" Cc: Aymen Sghaier Cc: Fabio Estevam Cc: Peng Fan Cc: Herbert Xu Cc: "David S. Miller" Cc: Lukas Auer Signed-off-by: Bryan O'Donoghue --- arch/arm/boot/dts/imx7s.dtsi | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) -- 2.7.4 diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 82ad26e..e38c159 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -805,6 +805,37 @@ status = "disabled"; }; + crypto: caam@30900000 { + compatible = "fsl,sec-v4.0"; + fsl,sec-era = <4>; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x30900000 0x40000>; + ranges = <0 0x30900000 0x40000>; + interrupts = ; + clocks = <&clks IMX7D_CAAM_CLK>, + <&clks IMX7D_AHB_CHANNEL_ROOT_CLK>; + clock-names = "ipg", "aclk"; + + sec_jr0: jr0@1000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = ; + }; + + sec_jr1: jr1@2000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = ; + }; + + sec_jr2: jr1@3000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x3000 0x1000>; + interrupts = ; + }; + }; + flexcan1: can@30a00000 { compatible = "fsl,imx7d-flexcan", "fsl,imx6q-flexcan"; reg = <0x30a00000 0x10000>;