From patchwork Sun Jun 25 20:45:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Priit Laes X-Patchwork-Id: 9808387 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 30E2E6022E for ; Sun, 25 Jun 2017 20:55:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 657C027FA6 for ; Sun, 25 Jun 2017 20:55:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58D3527FAE; Sun, 25 Jun 2017 20:55:10 +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.1 required=2.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,DKIM_VALID autolearn=no 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 0F20727FA6 for ; Sun, 25 Jun 2017 20:55:09 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=BItKpnbRqt+0oWmnKgEnHlqdWuHzfNPgzqnRofll1xY=; b=O046o5b7rPfPYJY5VsIyQv0F7p jxXkk2jLv5qsRVoiG2bidybGRLurR2isxXyp3XbpyhjaJ6Ds2OvUqcd+IMCGXvtEsEp+2mwaDdbLh 6BYv1dA5KeYryvSBaYxVO1Vlhq2yCkQDQrqCxjDx84YNZ5anB5Oj3f42Vhhj7l/agACAk6gqngYkG +MZIk82w9XWecCViTlaHxEqWuZvx5bXAqbB9KlafaIkMRIJsOUe9LPMGd36RhmFj7z3KWNqwjIjAp RCN+topiMcU0cPeutZ1bxmhZ2+bc+G/QctTAvM2o60OsOa/zfQpI3hxNNB86xnO6+jjCnOmayx7GV j87YL9yg==; 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 1dPEYm-0005WG-04; Sun, 25 Jun 2017 20:55:08 +0000 Received: from plaes.org ([188.166.43.21]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dPEY5-00042n-Qf for linux-arm-kernel@lists.infradead.org; Sun, 25 Jun 2017 20:54:27 +0000 Received: from localhost (85.253.161.114.cable.starman.ee [85.253.161.114]) by plaes.org (Postfix) with ESMTPSA id E4A6741A0B; Sun, 25 Jun 2017 20:45:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=plaes.org; s=mail; t=1498423552; bh=7a6Kb0qYcjG96a0Ot7mKmt9p52ZLNklXXndChjAbNkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=bsGoJU4asRf7GUdzxrPRPg9vivXmN8G+Fmjh1cAc4AjycyH/CHHfTPN6l/SbxpMGu AECpOltpA8rWYm1AzS6QrcRrMpuTbH00YeLKoTiHd3iVJYyPsVlopSneYMWRYSZfol HMTJVvSjYsKBfY3Lav0gopLXlvnGqXSYhQ3Yn7uYT9j+Rr26GBLgwvA1OHpggxgCQY 8HHkC4/m4wo/hZvjknSP/Yz+F3BpSlpXcJwKgcwnnBQYbz9kIpLHui6PR3BemK30YE yBTa61lbZ9pH5hZw85wLwEI2E45mdDmjEguCXRQ5qrg9HZ3MG1tGgfyTdIf67mPaza 24KYDTAlMmBiQ== From: Priit Laes To: Michael Turquette , Stephen Boyd , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Russell King , Philipp Zabel , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/6] clk: sunxi-ng: div: Add support for fixed post-divider Date: Sun, 25 Jun 2017 23:45:42 +0300 Message-Id: X-Mailer: git-send-email 2.9.4 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170625_135426_020943_B7D1EC77 X-CRM114-Status: UNSURE ( 9.89 ) X-CRM114-Notice: Please train this message. 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: linux-sunxi@googlegroups.com, Priit Laes , Jonathan Liu MIME-Version: 1.0 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 SATA clock on sun4i/sun7i is of type (parent) / M / 6 where 6 is fixed post-divider. Signed-off-by: Priit Laes --- drivers/clk/sunxi-ng/ccu_div.c | 12 ++++++++++-- drivers/clk/sunxi-ng/ccu_div.h | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu_div.c b/drivers/clk/sunxi-ng/ccu_div.c index c0e5c10..de30e15 100644 --- a/drivers/clk/sunxi-ng/ccu_div.c +++ b/drivers/clk/sunxi-ng/ccu_div.c @@ -62,8 +62,13 @@ static unsigned long ccu_div_recalc_rate(struct clk_hw *hw, parent_rate = ccu_mux_helper_apply_prediv(&cd->common, &cd->mux, -1, parent_rate); - return divider_recalc_rate(hw, parent_rate, val, cd->div.table, - cd->div.flags); + val = divider_recalc_rate(hw, parent_rate, val, cd->div.table, + cd->div.flags); + + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) + val /= cd->fixed_post_div; + + return val; } static int ccu_div_determine_rate(struct clk_hw *hw, @@ -89,6 +94,9 @@ static int ccu_div_set_rate(struct clk_hw *hw, unsigned long rate, val = divider_get_val(rate, parent_rate, cd->div.table, cd->div.width, cd->div.flags); + if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) + val *= cd->fixed_post_div; + spin_lock_irqsave(cd->common.lock, flags); reg = readl(cd->common.base + cd->common.reg); diff --git a/drivers/clk/sunxi-ng/ccu_div.h b/drivers/clk/sunxi-ng/ccu_div.h index 08d0744..f3a5028 100644 --- a/drivers/clk/sunxi-ng/ccu_div.h +++ b/drivers/clk/sunxi-ng/ccu_div.h @@ -86,9 +86,10 @@ struct ccu_div_internal { struct ccu_div { u32 enable; - struct ccu_div_internal div; + struct ccu_div_internal div; struct ccu_mux_internal mux; struct ccu_common common; + unsigned int fixed_post_div; }; #define SUNXI_CCU_DIV_TABLE_WITH_GATE(_struct, _name, _parent, _reg, \