From patchwork Tue Jul 11 10:56:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 9834489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 077C960393 for ; Tue, 11 Jul 2017 11:06:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8F8E2656B for ; Tue, 11 Jul 2017 11:06:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC39628161; Tue, 11 Jul 2017 11:06:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4D1F82656B for ; Tue, 11 Jul 2017 11:06:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=z568joR+yRY6N2p+T5yMiVxqzu3xkTBjDF1pjMxWjY4=; b=dv5A3EQ7oV1hIv g11zrTVl1Y4WECB+4wGaBDgCK9EdQ4hkkkN2rr8AQ05BF9zqb/n0VKwApsistdTGtuVCgI9j30ytD w3nnkUAKYC/wVSU17Zh8NFYuZa5uPsLz85+Bp0ZT7LCICP7r/mDHQP/OOYIh7UDmHIFEr3OWyycKM IaborvoKjHPw/GpG0E/AU9C1YXWgVzDHz33BzD1XxqJBfIxnAwL76xvzWDZL/nWAb2FABqF0IKPPH BXzUwr+wG0jspG6SZnrruufNEV1k0KLO0gIVJj+zQfcsytx+4URZnhQkEy19g1NneE49LabKBKmBl BRFTL5VfqJzcgnkcSpfQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dUt02-0004XF-PE; Tue, 11 Jul 2017 11:06:38 +0000 Received: from [222.66.158.135] (helo=SHSQR01.spreadtrum.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dUszu-0004FQ-Jd for linux-arm-kernel@lists.infradead.org; Tue, 11 Jul 2017 11:06:36 +0000 Received: from ig2.spreadtrum.com (shcas03.spreadtrum.com [10.0.1.207]) by SHSQR01.spreadtrum.com with ESMTP id v6BB0ntr059397 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Tue, 11 Jul 2017 19:00:49 +0800 (CST) (envelope-from Chunyan.Zhang@spreadtrum.com) Received: from SHCAS01.spreadtrum.com (10.0.1.201) by SHMBX01.spreadtrum.com (10.0.1.203) with Microsoft SMTP Server (TLS) id 15.0.847.32; Tue, 11 Jul 2017 19:00:48 +0800 Received: from localhost (10.0.73.143) by SHCAS01.spreadtrum.com (10.0.1.250) with Microsoft SMTP Server (TLS) id 15.0.847.32 via Frontend Transport; Tue, 11 Jul 2017 19:00:48 +0800 From: Chunyan Zhang To: Stephen Boyd , Michael Turquette , Rob Herring , Mark Rutland Subject: [PATCH V2 03/10] clk: sprd: Add common infrastructure Date: Tue, 11 Jul 2017 18:56:20 +0800 Message-ID: <20170711105627.20526-4-chunyan.zhang@spreadtrum.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170711105627.20526-1-chunyan.zhang@spreadtrum.com> References: <20170711105627.20526-1-chunyan.zhang@spreadtrum.com> MIME-Version: 1.0 X-MAIL: SHSQR01.spreadtrum.com v6BB0ntr059397 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170711_040631_711734_FF3E612C X-CRM114-Status: GOOD ( 17.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Orson Zhai , Arnd Bergmann , Chunyan Zhang , Ben Li , Xiaolong Zhang , linux-kernel@vger.kernel.org, Mark Brown , Chunyan Zhang , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Added Spreadtrum's clock driver framework together with common structures and interface functions. Signed-off-by: Chunyan Zhang --- drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 1 + drivers/clk/sprd/Kconfig | 4 +++ drivers/clk/sprd/Makefile | 3 ++ drivers/clk/sprd/common.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/sprd/common.h | 56 ++++++++++++++++++++++++++++++++ 6 files changed, 148 insertions(+) create mode 100644 drivers/clk/sprd/Kconfig create mode 100644 drivers/clk/sprd/Makefile create mode 100644 drivers/clk/sprd/common.c create mode 100644 drivers/clk/sprd/common.h diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 36cfea3..baf1688 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -225,6 +225,7 @@ source "drivers/clk/mvebu/Kconfig" source "drivers/clk/qcom/Kconfig" source "drivers/clk/renesas/Kconfig" source "drivers/clk/samsung/Kconfig" +source "drivers/clk/sprd/Kconfig" source "drivers/clk/sunxi-ng/Kconfig" source "drivers/clk/tegra/Kconfig" source "drivers/clk/ti/Kconfig" diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index c19983a..1d62721 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -81,6 +81,7 @@ obj-$(CONFIG_COMMON_CLK_SAMSUNG) += samsung/ obj-$(CONFIG_ARCH_SIRF) += sirf/ obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/ obj-$(CONFIG_PLAT_SPEAR) += spear/ +obj-$(CONFIG_ARCH_SPRD) += sprd/ obj-$(CONFIG_ARCH_STI) += st/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_ARCH_SUNXI) += sunxi-ng/ diff --git a/drivers/clk/sprd/Kconfig b/drivers/clk/sprd/Kconfig new file mode 100644 index 0000000..67a3287 --- /dev/null +++ b/drivers/clk/sprd/Kconfig @@ -0,0 +1,4 @@ +config SPRD_COMMON_CLK + tristate "Clock support for Spreadtrum SoCs" + depends on ARCH_SPRD || COMPILE_TEST + default ARCH_SPRD diff --git a/drivers/clk/sprd/Makefile b/drivers/clk/sprd/Makefile new file mode 100644 index 0000000..74f4b80 --- /dev/null +++ b/drivers/clk/sprd/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_SPRD_COMMON_CLK) += clk-sprd.o + +clk-sprd-y += common.o diff --git a/drivers/clk/sprd/common.c b/drivers/clk/sprd/common.c new file mode 100644 index 0000000..5ff0473 --- /dev/null +++ b/drivers/clk/sprd/common.c @@ -0,0 +1,83 @@ +/* + * Spreadtrum clock infrastructure + * + * Copyright (C) 2017 Spreadtrum, Inc. + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#include + +#include "common.h" + +static inline void __iomem *clk_find_base(const struct clk_addr_map *maps, + unsigned int num, unsigned int reg) +{ + int i; + + for (i = 0; i < num; i++) + if ((reg & 0xffff0000) == maps[i].phy) + return maps[i].virt; + + return 0; +} + +int sprd_clk_probe(struct device_node *node, const struct clk_addr_map *maps, + unsigned int count, const struct sprd_clk_desc *desc) +{ + int i, ret = 0; + struct sprd_clk_common *cclk; + struct clk_hw *hw; + + for (i = 0; i < desc->num_clk_clks; i++) { + cclk = desc->clk_clks[i]; + if (!cclk) + continue; + + cclk->base = clk_find_base(maps, count, cclk->reg); + if (!cclk->base) { + pr_err("%s: No mapped address found for clock(0x%x)\n", + __func__, cclk->reg); + return -EINVAL; + } + cclk->reg = cclk->reg & 0xffff; + } + + for (i = 0; i < desc->hw_clks->num; i++) { + + hw = desc->hw_clks->hws[i]; + + if (!hw) + continue; + + ret = clk_hw_register(NULL, hw); + if (ret) { + pr_err("Couldn't register clock %d - %s\n", + i, hw->init->name); + goto err_clk_unreg; + } + } + + ret = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, + desc->hw_clks); + if (ret) { + pr_err("Failed to add clock provider.\n"); + goto err_clk_unreg; + } + + return 0; + +err_clk_unreg: + while (--i >= 0) { + hw = desc->hw_clks->hws[i]; + if (!hw) + continue; + + clk_hw_unregister(hw); + } + + return ret; +} +EXPORT_SYMBOL_GPL(sprd_clk_probe); + +MODULE_LICENSE("GPL v2"); diff --git a/drivers/clk/sprd/common.h b/drivers/clk/sprd/common.h new file mode 100644 index 0000000..c747a7d --- /dev/null +++ b/drivers/clk/sprd/common.h @@ -0,0 +1,56 @@ +/* + * Spreadtrum clock infrastructure + * + * Copyright (C) 2017 Spreadtrum, Inc. + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#ifndef _SPRD_CLK_COMMON_H_ +#define _SPRD_CLK_COMMON_H_ + +#include + +#include "../clk_common.h" + +struct device_node; + +struct sprd_clk_common { + void __iomem *base; + u32 reg; + spinlock_t *lock; + struct clk_hw hw; +}; + +struct clk_addr_map { + phys_addr_t phy; + void __iomem *virt; +}; + +static inline u32 sprd_clk_readl(const struct sprd_clk_common *common) +{ + return readl(common->base + common->reg); +} + +static inline void sprd_clk_writel(u32 val, + const struct sprd_clk_common *common) +{ + writel(val, common->base + common->reg); +} + +static inline struct sprd_clk_common * + hw_to_sprd_clk_common(const struct clk_hw *hw) +{ + return container_of(hw, struct sprd_clk_common, hw); +} + +struct sprd_clk_desc { + struct sprd_clk_common **clk_clks; + unsigned long num_clk_clks; + struct clk_hw_onecell_data *hw_clks; +}; + +int sprd_clk_probe(struct device_node *node, const struct clk_addr_map *maps, + unsigned int count, const struct sprd_clk_desc *desc); + +#endif /* _SPRD_CLK_COMMON_H_ */