From patchwork Sun Jun 18 01:58:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 9794635 X-Patchwork-Delegate: sboyd@codeaurora.org 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 3313E601A1 for ; Sun, 18 Jun 2017 02:03:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2539D28526 for ; Sun, 18 Jun 2017 02:03:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19AF328552; Sun, 18 Jun 2017 02:03:18 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07DD828550 for ; Sun, 18 Jun 2017 02:03:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753160AbdFRCDO (ORCPT ); Sat, 17 Jun 2017 22:03:14 -0400 Received: from sci-ig2.spreadtrum.com ([222.66.158.135]:58817 "EHLO SHSQR01.spreadtrum.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753158AbdFRCDL (ORCPT ); Sat, 17 Jun 2017 22:03:11 -0400 Received: from ig2.spreadtrum.com (shcas01.spreadtrum.com [10.0.1.201]) by SHSQR01.spreadtrum.com with ESMTP id v5I22CoP050431 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Sun, 18 Jun 2017 10:02:12 +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; Sun, 18 Jun 2017 10:02:12 +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; Sun, 18 Jun 2017 10:02:11 +0800 From: Chunyan Zhang To: Michael Turquette , Stephen Boyd , Rob Herring , Mark Rutland CC: , , , , Arnd Bergmann , Mark Brown , Xiaolong Zhang , Orson Zhai , Geng Ren , Chunyan Zhang , Chunyan Zhang Subject: [PATCH V1 6/9] clk: sprd: add composite clock support Date: Sun, 18 Jun 2017 09:58:52 +0800 Message-ID: <20170618015855.27738-7-chunyan.zhang@spreadtrum.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170618015855.27738-1-chunyan.zhang@spreadtrum.com> References: <20170618015855.27738-1-chunyan.zhang@spreadtrum.com> MIME-Version: 1.0 X-MAIL: SHSQR01.spreadtrum.com v5I22CoP050431 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch introduced composite driver whose functions are simply consisted of divider and mux clocks. Original-by: Xiaolong Zhang Signed-off-by: Chunyan Zhang --- drivers/clk/sprd/Makefile | 2 +- drivers/clk/sprd/ccu_composite.c | 62 ++++++++++++++++++++++++++++++++++++++++ drivers/clk/sprd/ccu_composite.h | 47 ++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/sprd/ccu_composite.c create mode 100644 drivers/clk/sprd/ccu_composite.h diff --git a/drivers/clk/sprd/Makefile b/drivers/clk/sprd/Makefile index d129c0a8..83232e5 100644 --- a/drivers/clk/sprd/Makefile +++ b/drivers/clk/sprd/Makefile @@ -1,3 +1,3 @@ ifneq ($(CONFIG_OF),) -obj-y += ccu_common.o ccu_gate.o ccu_mux.o ccu_div.o +obj-y += ccu_common.o ccu_gate.o ccu_mux.o ccu_div.o ccu_composite.o endif diff --git a/drivers/clk/sprd/ccu_composite.c b/drivers/clk/sprd/ccu_composite.c new file mode 100644 index 0000000..6a64fb1 --- /dev/null +++ b/drivers/clk/sprd/ccu_composite.c @@ -0,0 +1,62 @@ +/* + * Spreadtrum composite clock driver + * + * Copyright (C) 2017 Spreadtrum, Inc. + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#include + +#include "ccu_composite.h" + +DEFINE_SPINLOCK(comp_lock); + +static long ccu_comp_round_rate(struct clk_hw *hw, unsigned long rate, + unsigned long *parent_rate) +{ + struct ccu_comp *cc = hw_to_ccu_comp(hw); + + return ccu_div_helper_round_rate(&cc->common, &cc->div, + rate, parent_rate); +} + +static unsigned long ccu_comp_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct ccu_comp *cc = hw_to_ccu_comp(hw); + + return ccu_div_helper_recalc_rate(&cc->common, &cc->div, parent_rate); +} + +static int ccu_comp_set_rate(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) +{ + struct ccu_comp *cc = hw_to_ccu_comp(hw); + + return ccu_div_helper_set_rate(&cc->common, &cc->div, + rate, parent_rate); +} + +static u8 ccu_comp_get_parent(struct clk_hw *hw) +{ + struct ccu_comp *cc = hw_to_ccu_comp(hw); + + return ccu_mux_helper_get_parent(&cc->common, &cc->mux); +} + +static int ccu_comp_set_parent(struct clk_hw *hw, u8 index) +{ + struct ccu_comp *cc = hw_to_ccu_comp(hw); + + return ccu_mux_helper_set_parent(&cc->common, &cc->mux, index); +} + +const struct clk_ops ccu_comp_ops = { + .get_parent = ccu_comp_get_parent, + .set_parent = ccu_comp_set_parent, + + .round_rate = ccu_comp_round_rate, + .recalc_rate = ccu_comp_recalc_rate, + .set_rate = ccu_comp_set_rate, +}; diff --git a/drivers/clk/sprd/ccu_composite.h b/drivers/clk/sprd/ccu_composite.h new file mode 100644 index 0000000..c99c919 --- /dev/null +++ b/drivers/clk/sprd/ccu_composite.h @@ -0,0 +1,47 @@ +/* + * Spreadtrum composite clock driver + * + * Copyright (C) 2017 Spreadtrum, Inc. + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#ifndef _CCU_COMPOSITE_H_ +#define _CCU_COMPOSITE_H_ + +#include "ccu_common.h" +#include "ccu_mux.h" +#include "ccu_div.h" + +struct ccu_comp { + struct ccu_mux_internal mux; + struct ccu_div_internal div; + struct ccu_common common; +}; + +#define SPRD_CCU_COMP(_struct, _name, _parent, _reg, _table, \ + _mshift, _mwidth, _dshift, _dwidth, _flags) \ + struct ccu_comp _struct = { \ + .mux = _SPRD_CCU_MUX(_mshift, _mwidth, _table), \ + .div = _SPRD_CCU_DIV(_dshift, _dwidth), \ + .common = { \ + .reg = _reg, \ + .lock = &comp_lock, \ + .hw.init = CLK_HW_INIT_PARENTS(_name, \ + _parent, \ + &ccu_comp_ops, \ + _flags), \ + } \ + } + +static inline struct ccu_comp *hw_to_ccu_comp(struct clk_hw *hw) +{ + struct ccu_common *common = hw_to_ccu_common(hw); + + return container_of(common, struct ccu_comp, common); +} + +extern const struct clk_ops ccu_comp_ops; +extern spinlock_t comp_lock; + +#endif /* _CCU_COMPOSITE_H_ */