From patchwork Tue Sep 22 14:12:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 7239391 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4D91FBEEC1 for ; Tue, 22 Sep 2015 14:19:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B9CB207DF for ; Tue, 22 Sep 2015 14:19:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0B055207CC for ; Tue, 22 Sep 2015 14:19:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZeONY-0000B8-Tu; Tue, 22 Sep 2015 14:17:08 +0000 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZeONE-0008Mh-KI for linux-arm-kernel@lists.infradead.org; Tue, 22 Sep 2015 14:16:50 +0000 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.15.0.59/8.15.0.59) with SMTP id t8MEEdo7018036; Tue, 22 Sep 2015 07:16:16 -0700 Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0a-0016f401.pphosted.com with ESMTP id 1x152hggs3-1 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 22 Sep 2015 07:16:16 -0700 Received: from SC-EXCH02.marvell.com (10.93.176.82) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Tue, 22 Sep 2015 07:16:15 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server id 15.0.1044.25 via Frontend Transport; Tue, 22 Sep 2015 07:16:15 -0700 Received: from xhacker.marvell.com (unknown [10.37.135.134]) by maili.marvell.com (Postfix) with ESMTP id 5B2E03F703F; Tue, 22 Sep 2015 07:16:13 -0700 (PDT) From: Jisheng Zhang To: , , , , , , , Subject: [PATCH 2/5] clk: berlin: add common clk driver for newer SoCs Date: Tue, 22 Sep 2015 22:12:33 +0800 Message-ID: <1442931156-5877-3-git-send-email-jszhang@marvell.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1442931156-5877-1-git-send-email-jszhang@marvell.com> References: <1442931156-5877-1-git-send-email-jszhang@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2015-09-22_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=inbound_notspam policy=inbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1507310000 definitions=main-1509220208 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150922_071648_766611_6A5E4638 X-CRM114-Status: GOOD ( 17.42 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jisheng Zhang , devicetree@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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 Add berlin-clk driver for Marvell SoCs newer than BG2, BG2CD, BG2Q. berlin_clk_register() is provided for registering such kind of clk. Signed-off-by: Jisheng Zhang --- drivers/clk/berlin/Makefile | 2 +- drivers/clk/berlin/clk.c | 147 ++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/berlin/clk.h | 38 ++++++++++++ 3 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/berlin/clk.c create mode 100644 drivers/clk/berlin/clk.h diff --git a/drivers/clk/berlin/Makefile b/drivers/clk/berlin/Makefile index 747700d..741ba22 100644 --- a/drivers/clk/berlin/Makefile +++ b/drivers/clk/berlin/Makefile @@ -1,4 +1,4 @@ -obj-y += pll.o berlin2-avpll.o berlin2-pll.o berlin2-div.o +obj-y += pll.o clk.o berlin2-avpll.o berlin2-pll.o berlin2-div.o obj-$(CONFIG_MACH_BERLIN_BG2) += bg2.o obj-$(CONFIG_MACH_BERLIN_BG2CD) += bg2.o obj-$(CONFIG_MACH_BERLIN_BG2Q) += bg2q.o diff --git a/drivers/clk/berlin/clk.c b/drivers/clk/berlin/clk.c new file mode 100644 index 0000000..6d64faf --- /dev/null +++ b/drivers/clk/berlin/clk.c @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2013 Marvell Technology Group Ltd. + * + * Author: Jisheng Zhang + * + * 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 "clk.h" + +#define CLKEN (1 << 0) +#define CLKPLLSEL_MASK 7 +#define CLKPLLSEL_SHIFT 1 +#define CLKPLLSWITCH (1 << 4) +#define CLKSWITCH (1 << 5) +#define CLKD3SWITCH (1 << 6) +#define CLKSEL_MASK 7 +#define CLKSEL_SHIFT 7 + +struct berlin_clk { + struct clk_hw hw; + void __iomem *base; +}; + +#define to_berlin_clk(hw) container_of(hw, struct berlin_clk, hw) + +static u8 clk_div[] = {1, 2, 4, 6, 8, 12, 1, 1}; + +static unsigned long berlin_clk_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + u32 val, divider; + struct berlin_clk *clk = to_berlin_clk(hw); + + val = readl_relaxed(clk->base); + if (val & CLKD3SWITCH) + divider = 3; + else { + if (val & CLKSWITCH) { + val >>= CLKSEL_SHIFT; + val &= CLKSEL_MASK; + divider = clk_div[val]; + } else + divider = 1; + } + + return parent_rate / divider; +} + +static u8 berlin_clk_get_parent(struct clk_hw *hw) +{ + u32 val; + struct berlin_clk *clk = to_berlin_clk(hw); + + val = readl_relaxed(clk->base); + if (val & CLKPLLSWITCH) { + val >>= CLKPLLSEL_SHIFT; + val &= CLKPLLSEL_MASK; + return val; + } + + return 0; +} + +static int berlin_clk_enable(struct clk_hw *hw) +{ + u32 val; + struct berlin_clk *clk = to_berlin_clk(hw); + + val = readl_relaxed(clk->base); + val |= CLKEN; + writel_relaxed(val, clk->base); + + return 0; +} + +static void berlin_clk_disable(struct clk_hw *hw) +{ + u32 val; + struct berlin_clk *clk = to_berlin_clk(hw); + + val = readl_relaxed(clk->base); + val &= ~CLKEN; + writel_relaxed(val, clk->base); +} + +static int berlin_clk_is_enabled(struct clk_hw *hw) +{ + u32 val; + struct berlin_clk *clk = to_berlin_clk(hw); + + val = readl_relaxed(clk->base); + val &= CLKEN; + + return val ? 1 : 0; +} + +static const struct clk_ops berlin_clk_ops = { + .recalc_rate = berlin_clk_recalc_rate, + .get_parent = berlin_clk_get_parent, + .enable = berlin_clk_enable, + .disable = berlin_clk_disable, + .is_enabled = berlin_clk_is_enabled, +}; + +struct clk * __init berlin_clk_register(const char *name, int num_parents, + const char **parent_names, unsigned long flags, + void __iomem *base) +{ + struct clk *clk; + struct berlin_clk *bclk; + struct clk_init_data init; + + bclk = kzalloc(sizeof(*bclk), GFP_KERNEL); + if (!bclk) + return ERR_PTR(-ENOMEM); + + init.name = name; + init.ops = &berlin_clk_ops; + init.parent_names = parent_names; + init.num_parents = num_parents; + init.flags = flags; + + bclk->base = base; + bclk->hw.init = &init; + + clk = clk_register(NULL, &bclk->hw); + if (IS_ERR(clk)) + kfree(bclk); + + return clk; +} diff --git a/drivers/clk/berlin/clk.h b/drivers/clk/berlin/clk.h new file mode 100644 index 0000000..502689e --- /dev/null +++ b/drivers/clk/berlin/clk.h @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2015 Marvell Technology Group Ltd. + * + * Author: Jisheng Zhang + * + * 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 . + */ + +#ifndef __BERLIN_CLK_H +#define __BERLIN_CLK_H + +struct gateclk_desc { + const char *name; + const char *parent_name; + u8 bit_idx; + unsigned long flags; +}; + +struct clk_desc { + const char *name; + u32 offset; + unsigned long flags; +}; + +struct clk * __init berlin_clk_register(const char *name, int num_parents, + const char **parent_names, unsigned long flags, + void __iomem *base); +#endif