From patchwork Thu Jul 30 03:58:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victoria Milhoan X-Patchwork-Id: 6898191 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 54968C05AC for ; Thu, 30 Jul 2015 04:31:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6B389205B5 for ; Thu, 30 Jul 2015 04:31:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2214B205B4 for ; Thu, 30 Jul 2015 04:31:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750741AbbG3EbK (ORCPT ); Thu, 30 Jul 2015 00:31:10 -0400 Received: from mail-bn1bon0131.outbound.protection.outlook.com ([157.56.111.131]:57312 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750732AbbG3EbJ (ORCPT ); Thu, 30 Jul 2015 00:31:09 -0400 X-Greylist: delayed 1077 seconds by postgrey-1.27 at vger.kernel.org; Thu, 30 Jul 2015 00:31:09 EDT Received: from BY2PR03CA006.namprd03.prod.outlook.com (10.255.93.23) by DM2PR03MB576.namprd03.prod.outlook.com (10.141.84.19) with Microsoft SMTP Server (TLS) id 15.1.225.19; Thu, 30 Jul 2015 03:58:37 +0000 Received: from BL2FFO11FD035.protection.gbl (10.255.93.4) by BY2PR03CA006.outlook.office365.com (10.255.93.23) with Microsoft SMTP Server (TLS) id 15.1.225.19 via Frontend Transport; Thu, 30 Jul 2015 03:58:37 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; arm.linux.org.uk; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD035.mail.protection.outlook.com (10.173.161.131) with Microsoft SMTP Server (TLS) id 15.1.231.11 via Frontend Transport; Thu, 30 Jul 2015 03:58:35 +0000 Received: from stc-hedley.am.freescale.net (stc-hedley.am.freescale.net [10.67.70.12]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t6U3wUbh025418; Wed, 29 Jul 2015 20:58:35 -0700 From: Victoria Milhoan To: CC: , , , , , Subject: [PATCH 08/12] ARM: clk-imx6q: Add CAAM clock support Date: Wed, 29 Jul 2015 20:58:25 -0700 Message-ID: <1438228709-27650-9-git-send-email-vicki.milhoan@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1438228709-27650-1-git-send-email-vicki.milhoan@freescale.com> References: <1438228709-27650-1-git-send-email-vicki.milhoan@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD035; 1:bperiAtjv+tGD1ou1BSO945pXMsXr/DqmWrmm6veQZVHmc4e9Qpma//jyNPIjOKBQPTk2MWuQJyo3VJ79LLkTv2ilEDv8ftj720uEyvAlT8O/krIFz17remVQ1dSHSCa6QjVoFy7DbfL6OD9Fg6xitQuCIrEUJOAdHAPGpIbmDZbuZohfj76m9wk6e5HrKe+nKjInL0SbYpKvj7/QAUBrdeILV+HwhddoJ5UAkoTcyth3SinrxDy+kcz33fnOWBvCTuUA6i2a1A982kYYIDucTrpXlO0414oov6WcMeeeVJ9PLK8AqOdba2yB4fWqjWi8Cx+YIwzHLhf9TyysOralQ== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(189002)(199003)(110136002)(19580405001)(50466002)(77096005)(48376002)(50986999)(50226001)(87936001)(47776003)(92566002)(76176999)(2950100001)(86362001)(85426001)(77156002)(106466001)(6806004)(19580395003)(36756003)(62966003)(104016003)(2351001)(33646002)(189998001)(46102003)(229853001)(105606002)(5001960100002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR03MB576; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB576; 2:XX07FKs0u5M04CZKpLhM/yPuv9DgYd/xRVROrxFR9DVXMtXwPSHi8JHnYzc7o3t09dGHrqiNnOEZSLk1SX+3uZUFqyTio1r9GnbVrLvlf0KxZdRer1LpGGCPPEM0ZJtqdNfvIydBqhgMbV6CpxblMqTxTdndJAPvFJzkZzUKFTk=; 3:K9IbKWEJ2urUynSCwJKeGA7EqQMtK030+NXa52gWU+24EOy0+ArwDPfhYFZE83RwXYvdhG9Okfz5dcMIqk4scAXDmwbJRtYZhGCXlar/DGfOYlVoFOgUrmAfZfabjfagFgeGDIB0DrL6pwLNljD4bkaUHvLPeSPXOFpaF77jUfJNZupBLIaz2ZGi3+EtSuG9XeJfWe31vAapHEEjnkLol+SYPl5yS+JLHupu6pkZhWU=; 25:iYfWea3/C2lKDzXAXdv6c6DCO0IG9Xnh8NmgjVot5uYSM+v5wCPkG6ihIIbUiS0A4Q/ELDpAbAL8q+XFofErfnXnswETc+J7LmErn3KnLjEDFRwbwEAjZTRJVmUAu2qYNmryDK1S7Yn2ByGTijPVb8EdS8n83LNC14vuwHA1v9lX5DPWcdanqnkpd10GG7ZSR9y1n+RBYP5oZ1lOQY46ap8fp/Sgw7bKJhWCETOa36RuLPtvbt/nMaOpW7Bh8MuKlajSnm66IaBFstz3n1rF4g== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB576; X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB576; 20:R5yuNLXTEvUt6A6JfGxfNHKXgsTvEkyhJZ7B47K9gYssqqvRPVFlyA9bVS4qnkXPCWlNgO79kDRKSvfe626yh52tWb9DDe2rLpBMTM6Re92OFfQWJfU2fij1UTycMJZp+7OX0Hbx90Omb8SiglGbI4O2jKze9EQQ2rRYBbSWuif21k5G+UlEdTIlpNHsoEQLXHvGW5IqmxqtPWLw8EbSoZl79Cs8NbfdS94w/Akbnvh2EcpEa4j4RbqDizST79qWNKLS25H99NboJLCTTFAnY9HLpdOekEeKtNUWQOohC1DUqGT0oy7PvTu24+tIA/aVW9XcbbPsyTR05So6fjAH0ytHo/oxXG1oyuxqxHKgkmo=; 4:EZ4GGJx/fJt2gWotcOQ3wzJHTNYAIu48Ey+a9mI8Dc4fU8WTk7YqiBGouzTfWN7vMadv6Rd+hnuflB7tj7k+Pxg12eVJsPY3erJrhU31OCbZdXlT/FTstmdBfKt/FfOD/3P5FPnOKFJPG3goOPjZ7HeomV4XN5F/t3eyw0AXYoTLUdH+/SU9fdAX3z9DkmqPDzlx1Ul+sQ9uzTYZaPikLoXR8WxFyTu8poDOZCPuYHj8RefUFAO5kStV/MY/ENq5si4ka+7efCiQo7tVuuBbpOtiWVyq7XHEGSAzadKfVxo= DM2PR03MB576: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:DM2PR03MB576; BCL:0; PCL:0; RULEID:; SRVR:DM2PR03MB576; X-Forefront-PRVS: 06530126A4 X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB576; 23:ojkiVCfOvLAMC31t3x+3d8pNNirTJTiYQ7jvOWaUyXqtW41wlzbYp19NG/KwE4gjX5spwgSRnsN7hb+LmxY5x2wpLlauiAcx0TN9LlGA5Pjkq0MDCYPHpiHeGV1us3NMX5uGouNzf2DrEWjpN4T9pjOL1UoxAoe/88DOUzd64M2MP3gYpVbfEV702vqYWrbPtT+h8Lrm9MGfuKYm1+NJjxQjNeNJI7AaSnaIh+XUiINPwRrJf7o4mpsv+pToZkcDB3BaD5Wf7dLfCIAAWI5aS95avwV61SZLVMEUyOX3m2S/ln1J2VSm5W8PemOyw4p9pnfEtaDQuWU4dS6MMre2k1DIwnQ2RG/hbF6NM//zWPX7UrSi3AwrpVfJerLFqwK6GNRLE9vzmlCIY815s1BoxSfh7sEIjwxIi0yIHva56roYzaWXKLrplUdWn2QUa6uppIXMb/ZS8WJW+QSIveF/sCP6qi/iIIjlsBUemMVLHWx6vlRS6q0fjJ3VkZJ3/oe98YP9eMSCszNo9AC+25WMeYhiOfEi24sMgtSDZ3vJxgR1SdM/2XvGs0dUl8WyVWbzOocS0aZfeAcysZiO6ooe66E+ygmQ/1QDLVR5VtkidWn787zG2dvMVXXm7TFOHJE/kXhhR4y9hob51feUm6jSY/+Agsyx42XRyan9KZyhglozHAZAsgTSYLEkUA7/y2uDy5Uonc6N6o1MDCOmeCB5tN1oOsV/tp07eXoMQbCq5IxdiZhrD5QbCWjf/rngiNezEGePLdLlkXnJB3XbkdBvP2wJiAVm7zHNSTsTXqJiD5QNLpsBaoZSfLnw/h/mv1oLKpIxlcHtXuPlgvfYnPLrXdlibQSMouiFvtnJP4dmKqHOu61VJ5hiWzsylm9l/hKP X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB576; 5:4Uj3zr6tqqb1YkRZmkezzoK8uPu3Td5AAnnGzGly6bvDufRbrXbiS4cXtDA9511GyzNEIlyOu9JWXWsquC+kleJU8q/9lCd21v8KVZuzSyM8Mcz0dz36NThlfRjcoGULrOpRYcdIdn5iecue002bQQ==; 24:s04EPpj1/6YwzsZ4aIERLwuuqAsVXUfhY9UvF2dz7OdbeRJ/FIFizxsXl3JdGMf1QXMxJtuuuev36dQDqGgICiVBr/YXyHE0z0lkRYiwogU=; 20:NYddBee295Lq8qHg4T2H+M9mDkg1p8htvrv5M6QVso2h23PKJCEzoZ8zimYdOg9tOXtmXh7uVU0fQVEdJ45kfg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2015 03:58:35.9754 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR03MB576 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Add CAAM clock support to the i.MX6 clocking infrastructure. Signed-off-by: Victoria Milhoan --- drivers/clk/imx/clk-imx6q.c | 3 +++ include/dt-bindings/clock/imx6qdl-clock.h | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c index d046f8e..4de4943 100644 --- a/drivers/clk/imx/clk-imx6q.c +++ b/drivers/clk/imx/clk-imx6q.c @@ -381,6 +381,9 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) clk[IMX6QDL_CLK_ASRC] = imx_clk_gate2_shared("asrc", "asrc_podf", base + 0x68, 6, &share_count_asrc); clk[IMX6QDL_CLK_ASRC_IPG] = imx_clk_gate2_shared("asrc_ipg", "ahb", base + 0x68, 6, &share_count_asrc); clk[IMX6QDL_CLK_ASRC_MEM] = imx_clk_gate2_shared("asrc_mem", "ahb", base + 0x68, 6, &share_count_asrc); + clk[IMX6QDL_CAAM_MEM] = imx_clk_gate2("caam_mem", "ahb", base + 0x68, 8); + clk[IMX6QDL_CAAM_ACLK] = imx_clk_gate2("caam_aclk", "ahb", base + 0x68, 10); + clk[IMX6QDL_CAAM_IPG] = imx_clk_gate2("caam_ipg", "ipg", base + 0x68, 12); clk[IMX6QDL_CLK_CAN1_IPG] = imx_clk_gate2("can1_ipg", "ipg", base + 0x68, 14); clk[IMX6QDL_CLK_CAN1_SERIAL] = imx_clk_gate2("can1_serial", "can_root", base + 0x68, 16); clk[IMX6QDL_CLK_CAN2_IPG] = imx_clk_gate2("can2_ipg", "ipg", base + 0x68, 18); diff --git a/include/dt-bindings/clock/imx6qdl-clock.h b/include/dt-bindings/clock/imx6qdl-clock.h index 8780868..f68e925 100644 --- a/include/dt-bindings/clock/imx6qdl-clock.h +++ b/include/dt-bindings/clock/imx6qdl-clock.h @@ -251,6 +251,9 @@ #define IMX6QDL_CLK_VIDEO_27M 238 #define IMX6QDL_CLK_MIPI_CORE_CFG 239 #define IMX6QDL_CLK_MIPI_IPG 240 -#define IMX6QDL_CLK_END 241 +#define IMX6QDL_CAAM_MEM 241 +#define IMX6QDL_CAAM_ACLK 242 +#define IMX6QDL_CAAM_IPG 243 +#define IMX6QDL_CLK_END 244 #endif /* __DT_BINDINGS_CLOCK_IMX6QDL_H */