From patchwork Mon Nov 4 20:36:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dinh Nguyen X-Patchwork-Id: 3137831 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1CB64BEEB2 for ; Mon, 4 Nov 2013 20:37:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F415620585 for ; Mon, 4 Nov 2013 20:37:35 +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 9D0E020119 for ; Mon, 4 Nov 2013 20:37:34 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VdQtY-0008Hf-VA; Mon, 04 Nov 2013 20:37: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 1VdQtV-0005Y1-Gt; Mon, 04 Nov 2013 20:37:05 +0000 Received: from ch1ehsobe004.messaging.microsoft.com ([216.32.181.184] helo=ch1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VdQtI-0005V7-P2 for linux-arm-kernel@lists.infradead.org; Mon, 04 Nov 2013 20:36:54 +0000 Received: from mail169-ch1-R.bigfish.com (10.43.68.239) by CH1EHSOBE004.bigfish.com (10.43.70.54) with Microsoft SMTP Server id 14.1.225.22; Mon, 4 Nov 2013 20:36:25 +0000 Received: from mail169-ch1 (localhost [127.0.0.1]) by mail169-ch1-R.bigfish.com (Postfix) with ESMTP id B282D160210; Mon, 4 Nov 2013 20:36:25 +0000 (UTC) X-Forefront-Antispam-Report: CIP:66.35.236.232; KIP:(null); UIP:(null); IPV:NLI; H:SJ-ITEXEDGE02.altera.priv.altera.com; RD:none; EFVD:NLI X-SpamScore: 2 X-BigFish: VS2(zz8d0Ic8kzz1f42h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h1d1ah1d2ah1fc6hzz8275ch1de098h17326ah8275bh8275dh1de097h186068h84d07hz2fh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h14ddh1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dfeh1dffh1e1dh1e23h1fe8h1ff5h2218h2216h1155h) Received-SPF: pass (mail169-ch1: domain of altera.com designates 66.35.236.232 as permitted sender) client-ip=66.35.236.232; envelope-from=dinguyen@altera.com; helo=SJ-ITEXEDGE02.altera.priv.altera.com ; v.altera.com ; Received: from mail169-ch1 (localhost.localdomain [127.0.0.1]) by mail169-ch1 (MessageSwitch) id 1383597383371957_18305; Mon, 4 Nov 2013 20:36:23 +0000 (UTC) Received: from CH1EHSMHS031.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.248]) by mail169-ch1.bigfish.com (Postfix) with ESMTP id 43A8E2A00CC; Mon, 4 Nov 2013 20:36:23 +0000 (UTC) Received: from SJ-ITEXEDGE02.altera.priv.altera.com (66.35.236.232) by CH1EHSMHS031.bigfish.com (10.43.70.31) with Microsoft SMTP Server (TLS) id 14.16.227.3; Mon, 4 Nov 2013 20:36:21 +0000 Received: from sj-mail01.altera.com (137.57.1.6) by SJ-ITEXEDGE02.altera.priv.altera.com (66.35.236.232) with Microsoft SMTP Server id 8.3.327.1; Mon, 4 Nov 2013 12:24:45 -0800 Received: from linux-builds1.altera.com (linux-builds1.altera.com [137.57.188.65]) by sj-mail01.altera.com (8.13.7+Sun/8.13.7) with ESMTP id rA4KaGSa022757; Mon, 4 Nov 2013 12:36:18 -0800 (PST) From: To: Subject: [PATCHv2 1/4] clk: socfpga: Add a clock driver for SOCFPGA's system manager Date: Mon, 4 Nov 2013 14:36:02 -0600 Message-ID: <1383597364-25613-2-git-send-email-dinguyen@altera.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1383597364-25613-1-git-send-email-dinguyen@altera.com> References: <1383597364-25613-1-git-send-email-dinguyen@altera.com> MIME-Version: 1.0 X-OriginatorOrg: altera.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131104_153652_910208_1B3D0276 X-CRM114-Status: GOOD ( 21.93 ) X-Spam-Score: -2.6 (--) Cc: Mark Rutland , devicetree@vger.kernel.org, Mike Turquette , Arnd Bergmann , Pawel Moll , Stephen Warren , Seungwon Jeon , linux-mmc@vger.kernel.org, Rob Herring , Jaehoon Chung , linux-arm-kernel@lists.infradead.org, Olof Johansson , Chris Ball , Dinh Nguyen , Ian Campbell 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 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 From: Dinh Nguyen The system manager is an IP block on the SOCFPGA platform. The system manager contains registers that control other IPs on the platform. One of the IPs that the system manager has control over is the SD/MMC, by way of controlling the clock phase on the SD/MMC Card Interface Unit. This patch adds a clock driver that the SD/MMC driver can use by calling the common clock API in order to set the appropriate register in the system manager by way of a syscon driver. This clock driver can also be re-used for other IPs that need to poke the system manager. Signed-off-by: Dinh Nguyen CC: Arnd Bergmann Cc: Mike Turquette CC: Olof Johansson Cc: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Stephen Warren Cc: Ian Campbell Cc: Chris Ball Cc: Jaehoon Chung Cc: Seungwon Jeon Cc: devicetree@vger.kernel.org Cc: linux-mmc@vger.kernel.org CC: linux-arm-kernel@lists.infradead.org --- v2: Use the syscon driver --- drivers/clk/socfpga/Makefile | 2 +- drivers/clk/socfpga/clk-sysmgr.c | 98 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/socfpga/clk-sysmgr.c diff --git a/drivers/clk/socfpga/Makefile b/drivers/clk/socfpga/Makefile index 0303c0b..cfceabc 100644 --- a/drivers/clk/socfpga/Makefile +++ b/drivers/clk/socfpga/Makefile @@ -1 +1 @@ -obj-y += clk.o +obj-y += clk.o clk-sysmgr.o diff --git a/drivers/clk/socfpga/clk-sysmgr.c b/drivers/clk/socfpga/clk-sysmgr.c new file mode 100644 index 0000000..96f9b26 --- /dev/null +++ b/drivers/clk/socfpga/clk-sysmgr.c @@ -0,0 +1,98 @@ +/* + * Copyright 2013 Altera Corporation + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +/* SDMMC Group for System Manager defines */ +#define SYSMGR_SDMMC_CTRL_SET(smplsel, drvsel) \ + ((((smplsel) & 0x7) << 3) | (((drvsel) & 0x7) << 0)) + +struct socfpga_sysmgr { + struct clk_hw hw; + struct regmap *sysreg; + u32 reg; +}; +#define to_sysmgr_clk(p) container_of(p, struct socfpga_sysmgr, hw) + +static int sysmgr_set_dwmmc_drvsel_smpsel(struct clk_hw *hwclk) +{ + struct device_node *np; + struct socfpga_sysmgr *socfpga_sysmgr = to_sysmgr_clk(hwclk); + u32 timing[2]; + u32 hs_timing; + + np = of_find_compatible_node(NULL, NULL, "altr,socfpga-dw-mshc"); + of_property_read_u32_array(np, "samsung,dw-mshc-sdr-timing", timing, 2); + hs_timing = SYSMGR_SDMMC_CTRL_SET(timing[1], timing[0]); + regmap_write(socfpga_sysmgr->sysreg, socfpga_sysmgr->reg, hs_timing); + return 0; +} + +static const struct clk_ops clk_sysmgr_sdmmc_ops = { + .enable = sysmgr_set_dwmmc_drvsel_smpsel, +}; + +static void __init socfpga_sysmgr_init(struct device_node *node, const struct clk_ops *ops) +{ + u32 reg; + struct clk *clk; + struct socfpga_sysmgr *socfpga_sysmgr; + const char *clk_name = node->name; + struct clk_init_data init; + int rc; + + socfpga_sysmgr = kzalloc(sizeof(*socfpga_sysmgr), GFP_KERNEL); + if (WARN_ON(!socfpga_sysmgr)) + return; + + rc = of_property_read_u32(node, "reg", ®); + if (WARN_ON(rc)) + return; + + socfpga_sysmgr->reg = reg; + + socfpga_sysmgr->sysreg = syscon_regmap_lookup_by_compatible("altr,sys-mgr"); + if (WARN_ON(IS_ERR(socfpga_sysmgr->sysreg))) { + pr_err("%s: No sysmgr phandle specified\n", __func__); + return; + } + + init.name = clk_name; + init.ops = ops; + init.flags = 0; + init.num_parents = 0; + + socfpga_sysmgr->hw.init = &init; + clk = clk_register(NULL, &socfpga_sysmgr->hw); + if (WARN_ON(IS_ERR(clk))) { + kfree(socfpga_sysmgr); + return; + } + rc = of_clk_add_provider(node, of_clk_src_simple_get, clk); + if (WARN_ON(rc)) + return; +} + +static void __init sysmgr_init(struct device_node *node) +{ + socfpga_sysmgr_init(node, &clk_sysmgr_sdmmc_ops); +} +CLK_OF_DECLARE(sysmgr, "altr,sysmgr-sdmmc-sdr", sysmgr_init);