From patchwork Mon Oct 30 06:02:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 117442 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2189935qgn; Sun, 29 Oct 2017 23:03:34 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QM/Dj/QTdCb5UZ8WehhiqT+oLkn/suQrhOe3PI3W/uCUxBodQ7s3cNmDO+VLIjYyryqqQv X-Received: by 10.84.231.129 with SMTP id g1mr6295827plk.188.1509343414690; Sun, 29 Oct 2017 23:03:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509343414; cv=none; d=google.com; s=arc-20160816; b=du9gDZ/z9Mi6eohnJDIcql3gmQHgBbmUFZcDCKmIEXWqti/u3zkbihBkbE+knpvtQz 7k9il+PoK3OzXSaQZJbe8S7ebimNqqNT3r4p9U7PJAmPf2C+3NzbPct13JsjfcKXb7vP tMsQI9wmCAiaWw0Z8srM5LrUamVrAi8nFxqxZQXt8Kh401Og08g8G8aD/Gpb5aCZEJWa S3hyUTSAUEMohjMpt4NvkCgzy0uKt6cPxzVxB0bfdUgj1cDpR2z62Jl8jtqFgRHjP61v 1wZIQqVQ/DeJ6oOO0tAmT0EthXz8CMHqtW2/PA+ujdZyGEytJWUMAm3Ln27j6qQf5MvK ZI4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=fm3z33wdAiw+JyigJ90d1zH3UpuPaMmqkD3rWE3eDbM=; b=n9wYodZpHpF0e/5yeI9uQJ7z7AJUOtlS1Q/7gZG8f/ZUhXlYRjo9Xqy/Cm5r06iSNL cAgeH5SRKnQGKWElwDSdJvdGaur/tKcjYTrvy/vS4lNEwDCw8eKC8O09iMwAxJ3uTLU5 /62L9WnT2V1atB35YK9onmh/+Xn/hFNkqnu6qL4mKFndalplj9o2t/SlWc4E+0JWwaeV Rh5Tl2QxK8a/71aqOpwLL+4L3Ff5+urGAaTHxB9+u/tFDf4bR802UoZ3eacnwcQgUsns iknFTL6FyHMOFphfTUhxKJH6aL/zwEGtZBdRyXeeIxHdkmfYoFnnOgdwrJyqaBOLj8Sb 2wbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=q8qN04he; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s5si5454028pgq.419.2017.10.29.23.03.34; Sun, 29 Oct 2017 23:03:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=q8qN04he; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752297AbdJ3GDc (ORCPT + 27 others); Mon, 30 Oct 2017 02:03:32 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:48919 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752242AbdJ3GD2 (ORCPT ); Mon, 30 Oct 2017 02:03:28 -0400 Received: by mail-pf0-f195.google.com with SMTP id b79so10169228pfk.5; Sun, 29 Oct 2017 23:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=fm3z33wdAiw+JyigJ90d1zH3UpuPaMmqkD3rWE3eDbM=; b=q8qN04herCnvx/uullTigbfUooADviwtriI1gIHJYNEGV2KJQCn/BuAfffAEGAfWEG qCS4/pvRIAe0uYUEI2O1SgF98YblUkag4kmm+eU23Ez9CJYDChtS/4XrjNnUdsoPwcNw jEOO7N3E70kP5F1S1E6Gu4f7MDG1kLugL69WtTqe8y+McBsPjET0D+N7LDe4CGTt/BoR M85Z9S/8LHJFAR3RX4xIWjaEPjn0ef754uC4tF7WZ3usMR5mSXlS6FfhfUWXd9aYT5sw qb0yo/ENS77WtagSJd7tVAKOnACWwHBu8YozkPnlySkotrjk65SQr9SBJZ76UpsMuVKs MIxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=fm3z33wdAiw+JyigJ90d1zH3UpuPaMmqkD3rWE3eDbM=; b=LheVyx5Qlw89GjpPlcBvi2KRJ8RPMyQAyx6veSAJRNol9UYJhSYNmLgqMe35UU/75X dL2nBHhiL7xfaYfkWIx4Q6ZLqgw3Tl/61fFqzmaOPpXQcyKLI7j4slB2Ixgy7m5NcFJm 9yhN8TvGO9zLjYi3T9jUYERNbyR4iv/XXopziJUrGTcb3ywGYRgxHZcBsc2GiJWz2fH+ HnoGdWzzlsKmgwH+MiTpuzP7FiGhih8ZAut0PymrINNZTLB4ZITRzXtvpRswTPjgfbuh 4EAw8BjH1Zn3mNBBXqymIRoNXj3CauBahm6IS8UrmovxQQIhlv55OqlR7AS1QBlCTep5 ECUg== X-Gm-Message-State: AMCzsaUJ4HkCDymH+Cl9WA8SvyBbhJlFBLtgBzJWPE+9yHiEJzTwbe6t iUSLMK4j/pMlvMujRTelugQ= X-Received: by 10.84.128.229 with SMTP id a92mr6488963pla.278.1509343408143; Sun, 29 Oct 2017 23:03:28 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id f2sm22982938pgt.75.2017.10.29.23.03.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 23:03:26 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 30 Oct 2017 16:33:18 +1030 From: Joel Stanley To: Lee Jones , Michael Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Andrew Jeffery , Benjamin Herrenschmidt , Jeremy Kerr , Rick Altherr , Ryan Chen , Arnd Bergmann Subject: [PATCH v5 2/5] clk: aspeed: Register core clocks Date: Mon, 30 Oct 2017 16:32:47 +1030 Message-Id: <20171030060250.701-3-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171030060250.701-1-joel@jms.id.au> References: <20171030060250.701-1-joel@jms.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This registers the core clocks; those which are required to calculate the rate of the timer peripheral so the system can load a clocksource driver. Signed-off-by: Joel Stanley --- v5: - Add Andrew's Reviewed-by v4: - Add defines to document the BIT() macros v3: - Fix ast2400 ahb calculation - Remove incorrect 'this is wrong' comment - Separate out clkin calc to be per platform - Support 48MHz clkin on ast2400 --- drivers/clk/clk-aspeed.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) -- 2.14.1 Reviewed-by: Andrew Jeffery diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c index 388a98f4ca41..a8da411326e9 100644 --- a/drivers/clk/clk-aspeed.c +++ b/drivers/clk/clk-aspeed.c @@ -20,7 +20,23 @@ #include +#define ASPEED_RESET_CTRL 0x04 +#define ASPEED_CLK_SELECTION 0x08 +#define ASPEED_CLK_STOP_CTRL 0x0c +#define ASPEED_MPLL_PARAM 0x20 +#define ASPEED_HPLL_PARAM 0x24 +#define AST2500_HPLL_BYPASS_EN BIT(20) +#define AST2400_HPLL_STRAPPED BIT(18) +#define AST2400_HPLL_BYPASS_EN BIT(17) +#define ASPEED_MISC_CTRL 0x2c +#define UART_DIV13_EN BIT(12) #define ASPEED_STRAP 0x70 +#define CLKIN_25MHZ_EN BIT(23) +#define AST2400_CLK_SOURCE_SEL BIT(18) +#define ASPEED_CLK_SELECTION_2 0xd8 + +/* Globally visible clocks */ +static DEFINE_SPINLOCK(aspeed_clk_lock); /* Keeps track of all clocks */ static struct clk_hw_onecell_data *aspeed_clk_data; @@ -98,6 +114,160 @@ static const struct aspeed_gate_data aspeed_gates[] = { [ASPEED_CLK_GATE_LHCCLK] = { 28, -1, "lhclk-gate", "lhclk", 0 }, /* LPC master/LPC+ */ }; +static const struct clk_div_table ast2400_div_table[] = { + { 0x0, 2 }, + { 0x1, 4 }, + { 0x2, 6 }, + { 0x3, 8 }, + { 0x4, 10 }, + { 0x5, 12 }, + { 0x6, 14 }, + { 0x7, 16 }, + { 0 } +}; + +static const struct clk_div_table ast2500_div_table[] = { + { 0x0, 4 }, + { 0x1, 8 }, + { 0x2, 12 }, + { 0x3, 16 }, + { 0x4, 20 }, + { 0x5, 24 }, + { 0x6, 28 }, + { 0x7, 32 }, + { 0 } +}; + +static struct clk_hw *aspeed_ast2400_calc_pll(const char *name, u32 val) +{ + unsigned int mult, div; + + if (val & AST2400_HPLL_BYPASS_EN) { + /* Pass through mode */ + mult = div = 1; + } else { + /* F = 24Mhz * (2-OD) * [(N + 2) / (D + 1)] */ + u32 n = (val >> 5) & 0x3f; + u32 od = (val >> 4) & 0x1; + u32 d = val & 0xf; + + mult = (2 - od) * (n + 2); + div = d + 1; + } + return clk_hw_register_fixed_factor(NULL, name, "clkin", 0, + mult, div); +}; + +static struct clk_hw *aspeed_ast2500_calc_pll(const char *name, u32 val) +{ + unsigned int mult, div; + + if (val & AST2500_HPLL_BYPASS_EN) { + /* Pass through mode */ + mult = div = 1; + } else { + /* F = clkin * [(M+1) / (N+1)] / (P + 1) */ + u32 p = (val >> 13) & 0x3f; + u32 m = (val >> 5) & 0xff; + u32 n = val & 0x1f; + + mult = (m + 1) / (n + 1); + div = p + 1; + } + + return clk_hw_register_fixed_factor(NULL, name, "clkin", 0, + mult, div); +} + +static void __init aspeed_ast2400_cc(struct regmap *map) +{ + struct clk_hw *hw; + u32 val, freq, div; + + /* + * CLKIN is the crystal oscillator, 24, 48 or 25MHz selected by + * strapping + */ + regmap_read(map, ASPEED_STRAP, &val); + if (val & CLKIN_25MHZ_EN) + freq = 25000000; + else if (val & AST2400_CLK_SOURCE_SEL) + freq = 48000000; + else + freq = 24000000; + hw = clk_hw_register_fixed_rate(NULL, "clkin", NULL, 0, freq); + pr_debug("clkin @%u MHz\n", freq / 1000000); + + /* + * High-speed PLL clock derived from the crystal. This the CPU clock, + * and we assume that it is enabled + */ + regmap_read(map, ASPEED_HPLL_PARAM, &val); + WARN(val & AST2400_HPLL_STRAPPED, "hpll is strapped not configured"); + aspeed_clk_data->hws[ASPEED_CLK_HPLL] = aspeed_ast2400_calc_pll("hpll", val); + + /* + * Strap bits 11:10 define the CPU/AHB clock frequency ratio (aka HCLK) + * 00: Select CPU:AHB = 1:1 + * 01: Select CPU:AHB = 2:1 + * 10: Select CPU:AHB = 4:1 + * 11: Select CPU:AHB = 3:1 + */ + regmap_read(map, ASPEED_STRAP, &val); + val = (val >> 10) & 0x3; + div = val + 1; + if (div == 3) + div = 4; + else if (div == 4) + div = 3; + hw = clk_hw_register_fixed_factor(NULL, "ahb", "hpll", 0, 1, div); + aspeed_clk_data->hws[ASPEED_CLK_AHB] = hw; + + /* APB clock clock selection register SCU08 (aka PCLK) */ + hw = clk_hw_register_divider_table(NULL, "apb", "hpll", 0, + scu_base + ASPEED_CLK_SELECTION, 23, 3, 0, + ast2400_div_table, + &aspeed_clk_lock); + aspeed_clk_data->hws[ASPEED_CLK_APB] = hw; +} + +static void __init aspeed_ast2500_cc(struct regmap *map) +{ + struct clk_hw *hw; + u32 val, freq, div; + + /* CLKIN is the crystal oscillator, 24 or 25MHz selected by strapping */ + regmap_read(map, ASPEED_STRAP, &val); + if (val & CLKIN_25MHZ_EN) + freq = 25000000; + else + freq = 24000000; + hw = clk_hw_register_fixed_rate(NULL, "clkin", NULL, 0, freq); + pr_debug("clkin @%u MHz\n", freq / 1000000); + + /* + * High-speed PLL clock derived from the crystal. This the CPU clock, + * and we assume that it is enabled + */ + regmap_read(map, ASPEED_HPLL_PARAM, &val); + aspeed_clk_data->hws[ASPEED_CLK_HPLL] = aspeed_ast2500_calc_pll("hpll", val); + + /* Strap bits 11:9 define the AXI/AHB clock frequency ratio (aka HCLK)*/ + regmap_read(map, ASPEED_STRAP, &val); + val = (val >> 9) & 0x7; + WARN(val == 0, "strapping is zero: cannot determine ahb clock"); + div = 2 * (val + 1); + hw = clk_hw_register_fixed_factor(NULL, "ahb", "hpll", 0, 1, div); + aspeed_clk_data->hws[ASPEED_CLK_AHB] = hw; + + /* APB clock clock selection register SCU08 (aka PCLK) */ + regmap_read(map, ASPEED_CLK_SELECTION, &val); + val = (val >> 23) & 0x7; + div = 4 * (val + 1); + hw = clk_hw_register_fixed_factor(NULL, "apb", "hpll", 0, 1, div); + aspeed_clk_data->hws[ASPEED_CLK_APB] = hw; +}; + static void __init aspeed_cc_init(struct device_node *np) { struct regmap *map; @@ -139,6 +309,13 @@ static void __init aspeed_cc_init(struct device_node *np) return; } + if (of_device_is_compatible(np, "aspeed,ast2400-scu")) + aspeed_ast2400_cc(map); + else if (of_device_is_compatible(np, "aspeed,ast2500-scu")) + aspeed_ast2500_cc(map); + else + pr_err("unknown platform, failed to add clocks\n"); + aspeed_clk_data->num = ASPEED_NUM_CLKS; ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, aspeed_clk_data); if (ret)