From patchwork Mon Oct 30 06:02:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 117441 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2189839qgn; Sun, 29 Oct 2017 23:03:26 -0700 (PDT) X-Google-Smtp-Source: ABhQp+S9duaSqPmZOAaeGdV5CFqGfMRQsFw6xUNfasD6mGiTeN3dlq0aFPrHeLLj4uYmVqUNvrLD X-Received: by 10.84.242.74 with SMTP id c10mr6681624pll.141.1509343406246; Sun, 29 Oct 2017 23:03:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509343406; cv=none; d=google.com; s=arc-20160816; b=Y+wUr1SMVT4z+dV0m/vo6M3RwHLExR9rzw46XIJIY4LiwNzJs1G2jnqjwH9zZEbO34 JDqz5cyAfuzAJgXr7rLhs7HdgMGVf32kOwDqECigOs0MSuBfyMU7bKHH5YovUn6BnxM+ 71dE4elrIeVqU91EaFDOLHKtRleDKc03R0u+wlY3GRJMQ79vPBVhq5rLomDHtJ2pJfmq GakuSCwlnl6GIOkzc4ndECXUc/ujQm66mVYEBwjwt0tW7UEwPcfntgT3QBk6TW8DUAi4 +i1sfIhAJxC+0Bp6EsyozooYVV5xFGsP2u2LZ/0B7O9ynSkSDBelTAem/K9iF7thYlIA cBDg== 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=MUswXiz0SbOQ+iIKRdoEKMGuCkkbxP4nuQ/jIxwPtmI=; b=HqaWU7drSAlptqv86pTiYlVfNYVkP/yfsHYQrvTqGHFHHVzPYFnw3akiPAdTaTBZVb MqTBC1Cg3XxZo2o1ub4JPTcdizXpMbd+UnEBDRWJN1XDE4a03tmUrM8A3zt55dal3oAH EYF5e8TGnNU8F8QPtTYThotHCxpYtmv7yUqxTQ8fWGa9i9t53Dbzbl/Zfqv20bg6/s3v zvmNtP6+Y9wFQkAh6PHdWXEvHMf4eemrae4f2GMKf1z+W3TqfAaxJue9oIgTbCj/TfU0 ZK+qZfSLkK3y8o/m2KIbJVUVI7EpWwpGKWM73ytbFffrvsDVpsxRCZVIRD+3SkxfQ1sI 3/3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=sEfUDHLt; 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 f29si9288356pgn.736.2017.10.29.23.03.25; Sun, 29 Oct 2017 23:03:26 -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=sEfUDHLt; 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 S1752226AbdJ3GDW (ORCPT + 27 others); Mon, 30 Oct 2017 02:03:22 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:47234 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751540AbdJ3GDT (ORCPT ); Mon, 30 Oct 2017 02:03:19 -0400 Received: by mail-pf0-f194.google.com with SMTP id z11so10172706pfk.4; Sun, 29 Oct 2017 23:03:19 -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=MUswXiz0SbOQ+iIKRdoEKMGuCkkbxP4nuQ/jIxwPtmI=; b=sEfUDHLta08SqjmyUWU5DrcdWaBzmg2DKMKvrvNKo6aQTeAqIPTRKOh96HeoVzwIbz P8lnlmdryCrkn5tFaGBpeceswp8cb1/tUHrDC8Y5HZD5ZnJNu+F8nH4OtYRK9N+GHj7d 4sgvuXvCSAuiM926m6LeOQTLb/4Sy9eU6Hw8PZF5YRzmlz6Sg33ulaRACNVqdUt7Q0M1 Yrt3i5WYty9sDHbBT68ASufcBKYVoBKIzPPndyRD8hQ2x9lHIu/1I04CqBFTFlSuX2Oe d90iemYpqijPlXgkOvV+ftsiWAnUI2SqjyPW2OC462DBFhLJurUedv3J2gZVp2ocYyxB EbOQ== 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=MUswXiz0SbOQ+iIKRdoEKMGuCkkbxP4nuQ/jIxwPtmI=; b=kweprupxbaPyRMQ2dB9TRPSMy6LZZldnO/c6ZcLGjiBg7tC8tkr+gbytot2Qnrw00o 0978u2S+Nsgwt5kz0mjJN8WBGaelPiO80N13lubePHRO5v389tfQCZZZDbJ8IDVePwmg AAIgR0Eo0mRaCJtDN9MiwlWuQgxZhSq9VCB7alGSDyRYwopZyHgG6HJ+QscmhM6x4SOV cYMn0AFuB/5l1YuGwWfNBiN9gvO8xqF9MYhgpZ+8UccLxggDdbIJUXiBPClK5HHaERkU E/jM0/dOuUst17HmBeLtMIt11h4s79mPj1OOBCmwGohmaP50qsrVLFPN+0hzYW+v0dIN 0fEQ== X-Gm-Message-State: AMCzsaU6WsBiqhOuMdzPKn3LuQvL5vuVcFM0dImlHl3baz9Hs7eSR3U0 NqQOjaltZlKAQH4LM1dGOQE= X-Received: by 10.84.238.203 with SMTP id l11mr6371852pln.194.1509343398438; Sun, 29 Oct 2017 23:03:18 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id 125sm24418963pff.14.2017.10.29.23.03.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 23:03:17 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 30 Oct 2017 16:33:09 +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 1/5] clk: Add clock driver for ASPEED BMC SoCs Date: Mon, 30 Oct 2017 16:32:46 +1030 Message-Id: <20171030060250.701-2-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 adds the stub of a driver for the ASPEED SoCs. The clocks are defined and the static registration is set up. Reviewed-by: Andrew Jeffery Signed-off-by: Joel Stanley --- v5: - Add Andrew's reviewed-by - Make aspeed_gates not initconst to avoid section mismatch warning v3: - use named initlisers for aspeed_gates table - fix clocks typo - Move ASPEED_NUM_CLKS to the bottom of the list - Put gates at the start of the list, so we can use them to initalise the aspeed_gates table - Add ASPEED_CLK_SELECTION_2 - Set parent of network MAC gates --- drivers/clk/Kconfig | 12 +++ drivers/clk/Makefile | 1 + drivers/clk/clk-aspeed.c | 148 +++++++++++++++++++++++++++++++ include/dt-bindings/clock/aspeed-clock.h | 42 +++++++++ 4 files changed, 203 insertions(+) create mode 100644 drivers/clk/clk-aspeed.c create mode 100644 include/dt-bindings/clock/aspeed-clock.h -- 2.14.1 diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 1c4e1aa6767e..9abe063ef8d2 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -142,6 +142,18 @@ config COMMON_CLK_GEMINI This driver supports the SoC clocks on the Cortina Systems Gemini platform, also known as SL3516 or CS3516. +config COMMON_CLK_ASPEED + bool "Clock driver for Aspeed BMC SoCs" + depends on ARCH_ASPEED || COMPILE_TEST + default ARCH_ASPEED + select MFD_SYSCON + select RESET_CONTROLLER + ---help--- + This driver supports the SoC clocks on the Aspeed BMC platforms. + + The G4 and G5 series, including the ast2400 and ast2500, are supported + by this driver. + config COMMON_CLK_S2MPS11 tristate "Clock driver for S2MPS1X/S5M8767 MFD" depends on MFD_SEC_CORE || COMPILE_TEST diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index c99f363826f0..575c68919d9b 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -26,6 +26,7 @@ obj-$(CONFIG_ARCH_CLPS711X) += clk-clps711x.o obj-$(CONFIG_COMMON_CLK_CS2000_CP) += clk-cs2000-cp.o obj-$(CONFIG_ARCH_EFM32) += clk-efm32gg.o obj-$(CONFIG_COMMON_CLK_GEMINI) += clk-gemini.o +obj-$(CONFIG_COMMON_CLK_ASPEED) += clk-aspeed.o obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o obj-$(CONFIG_CLK_HSDK) += clk-hsdk-pll.o obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c new file mode 100644 index 000000000000..388a98f4ca41 --- /dev/null +++ b/drivers/clk/clk-aspeed.c @@ -0,0 +1,148 @@ +/* + * Copyright 2017 IBM Corporation + * + * Joel Stanley + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +#define pr_fmt(fmt) "clk-aspeed: " fmt + +#include +#include +#include +#include +#include +#include + +#include + +#define ASPEED_STRAP 0x70 + +/* Keeps track of all clocks */ +static struct clk_hw_onecell_data *aspeed_clk_data; + +static void __iomem *scu_base; + +/** + * struct aspeed_gate_data - Aspeed gated clocks + * @clock_idx: bit used to gate this clock in the clock register + * @reset_idx: bit used to reset this IP in the reset register. -1 if no + * reset is required when enabling the clock + * @name: the clock name + * @parent_name: the name of the parent clock + * @flags: standard clock framework flags + */ +struct aspeed_gate_data { + u8 clock_idx; + s8 reset_idx; + const char *name; + const char *parent_name; + unsigned long flags; +}; + +/** + * struct aspeed_clk_gate - Aspeed specific clk_gate structure + * @hw: handle between common and hardware-specific interfaces + * @reg: register controlling gate + * @clock_idx: bit used to gate this clock in the clock register + * @reset_idx: bit used to reset this IP in the reset register. -1 if no + * reset is required when enabling the clock + * @flags: hardware-specific flags + * @lock: register lock + * + * Some of the clocks in the Aspeed SoC must be put in reset before enabling. + * This modified version of clk_gate allows an optional reset bit to be + * specified. + */ +struct aspeed_clk_gate { + struct clk_hw hw; + struct regmap *map; + u8 clock_idx; + s8 reset_idx; + u8 flags; + spinlock_t *lock; +}; + +#define to_aspeed_clk_gate(_hw) container_of(_hw, struct aspeed_clk_gate, hw) + +/* TODO: ask Aspeed about the actual parent data */ +static const struct aspeed_gate_data aspeed_gates[] = { + /* clk rst name parent flags */ + [ASPEED_CLK_GATE_ECLK] = { 0, -1, "eclk-gate", "eclk", 0 }, /* Video Engine */ + [ASPEED_CLK_GATE_GCLK] = { 1, 7, "gclk-gate", NULL, 0 }, /* 2D engine */ + [ASPEED_CLK_GATE_MCLK] = { 2, -1, "mclk-gate", "mpll", CLK_IS_CRITICAL }, /* SDRAM */ + [ASPEED_CLK_GATE_VCLK] = { 3, 6, "vclk-gate", NULL, 0 }, /* Video Capture */ + [ASPEED_CLK_GATE_BCLK] = { 4, 10, "bclk-gate", "bclk", 0 }, /* PCIe/PCI */ + [ASPEED_CLK_GATE_DCLK] = { 5, -1, "dclk-gate", NULL, 0 }, /* DAC */ + [ASPEED_CLK_GATE_REFCLK] = { 6, -1, "refclk-gate", "clkin", CLK_IS_CRITICAL }, + [ASPEED_CLK_GATE_USBPORT2CLK] = { 7, 3, "usb-port2-gate", NULL, 0 }, /* USB2.0 Host port 2 */ + [ASPEED_CLK_GATE_LCLK] = { 8, 5, "lclk-gate", NULL, 0 }, /* LPC */ + [ASPEED_CLK_GATE_USBUHCICLK] = { 9, 15, "usb-uhci-gate", NULL, 0 }, /* USB1.1 (requires port 2 enabled) */ + [ASPEED_CLK_GATE_D1CLK] = { 10, 13, "d1clk-gate", NULL, 0 }, /* GFX CRT */ + [ASPEED_CLK_GATE_YCLK] = { 13, 4, "yclk-gate", NULL, 0 }, /* HAC */ + [ASPEED_CLK_GATE_USBPORT1CLK] = { 14, 14, "usb-port1-gate", NULL, 0 }, /* USB2 hub/USB2 host port 1/USB1.1 dev */ + [ASPEED_CLK_GATE_UART1CLK] = { 15, -1, "uart1clk-gate", "uart", 0 }, /* UART1 */ + [ASPEED_CLK_GATE_UART2CLK] = { 16, -1, "uart2clk-gate", "uart", 0 }, /* UART2 */ + [ASPEED_CLK_GATE_UART5CLK] = { 17, -1, "uart5clk-gate", "uart", 0 }, /* UART5 */ + [ASPEED_CLK_GATE_ESPICLK] = { 19, -1, "espiclk-gate", NULL, 0 }, /* eSPI */ + [ASPEED_CLK_GATE_MAC1CLK] = { 20, 11, "mac1clk-gate", "mac", 0 }, /* MAC1 */ + [ASPEED_CLK_GATE_MAC2CLK] = { 21, 12, "mac2clk-gate", "mac", 0 }, /* MAC2 */ + [ASPEED_CLK_GATE_RSACLK] = { 24, -1, "rsaclk-gate", NULL, 0 }, /* RSA */ + [ASPEED_CLK_GATE_UART3CLK] = { 25, -1, "uart3clk-gate", "uart", 0 }, /* UART3 */ + [ASPEED_CLK_GATE_UART4CLK] = { 26, -1, "uart4clk-gate", "uart", 0 }, /* UART4 */ + [ASPEED_CLK_GATE_SDCLKCLK] = { 27, 16, "sdclk-gate", NULL, 0 }, /* SDIO/SD */ + [ASPEED_CLK_GATE_LHCCLK] = { 28, -1, "lhclk-gate", "lhclk", 0 }, /* LPC master/LPC+ */ +}; + +static void __init aspeed_cc_init(struct device_node *np) +{ + struct regmap *map; + u32 val; + int ret; + int i; + + scu_base = of_iomap(np, 0); + if (IS_ERR(scu_base)) + return; + + aspeed_clk_data = kzalloc(sizeof(*aspeed_clk_data) + + sizeof(*aspeed_clk_data->hws) * ASPEED_NUM_CLKS, + GFP_KERNEL); + if (!aspeed_clk_data) + return; + + /* + * This way all clocks fetched before the platform device probes, + * except those we assign here for early use, will be deferred. + */ + for (i = 0; i < ASPEED_NUM_CLKS; i++) + aspeed_clk_data->hws[i] = ERR_PTR(-EPROBE_DEFER); + + map = syscon_node_to_regmap(np); + if (IS_ERR(map)) { + pr_err("no syscon regmap\n"); + return; + } + /* + * We check that the regmap works on this very first access, + * but as this is an MMIO-backed regmap, subsequent regmap + * access is not going to fail and we skip error checks from + * this point. + */ + ret = regmap_read(map, ASPEED_STRAP, &val); + if (ret) { + pr_err("failed to read strapping register\n"); + return; + } + + aspeed_clk_data->num = ASPEED_NUM_CLKS; + ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, aspeed_clk_data); + if (ret) + pr_err("failed to add DT provider: %d\n", ret); +}; +CLK_OF_DECLARE_DRIVER(aspeed_cc_g5, "aspeed,ast2500-scu", aspeed_cc_init); +CLK_OF_DECLARE_DRIVER(aspeed_cc_g4, "aspeed,ast2400-scu", aspeed_cc_init); diff --git a/include/dt-bindings/clock/aspeed-clock.h b/include/dt-bindings/clock/aspeed-clock.h new file mode 100644 index 000000000000..4a99421d77c8 --- /dev/null +++ b/include/dt-bindings/clock/aspeed-clock.h @@ -0,0 +1,42 @@ +#ifndef DT_BINDINGS_ASPEED_CLOCK_H +#define DT_BINDINGS_ASPEED_CLOCK_H + +#define ASPEED_CLK_GATE_ECLK 0 +#define ASPEED_CLK_GATE_GCLK 1 +#define ASPEED_CLK_GATE_MCLK 2 +#define ASPEED_CLK_GATE_VCLK 3 +#define ASPEED_CLK_GATE_BCLK 4 +#define ASPEED_CLK_GATE_DCLK 5 +#define ASPEED_CLK_GATE_REFCLK 6 +#define ASPEED_CLK_GATE_USBPORT2CLK 7 +#define ASPEED_CLK_GATE_LCLK 8 +#define ASPEED_CLK_GATE_USBUHCICLK 9 +#define ASPEED_CLK_GATE_D1CLK 10 +#define ASPEED_CLK_GATE_YCLK 11 +#define ASPEED_CLK_GATE_USBPORT1CLK 12 +#define ASPEED_CLK_GATE_UART1CLK 13 +#define ASPEED_CLK_GATE_UART2CLK 14 +#define ASPEED_CLK_GATE_UART5CLK 15 +#define ASPEED_CLK_GATE_ESPICLK 16 +#define ASPEED_CLK_GATE_MAC1CLK 17 +#define ASPEED_CLK_GATE_MAC2CLK 18 +#define ASPEED_CLK_GATE_RSACLK 19 +#define ASPEED_CLK_GATE_UART3CLK 20 +#define ASPEED_CLK_GATE_UART4CLK 21 +#define ASPEED_CLK_GATE_SDCLKCLK 22 +#define ASPEED_CLK_GATE_LHCCLK 23 +#define ASPEED_CLK_HPLL 24 +#define ASPEED_CLK_AHB 25 +#define ASPEED_CLK_APB 26 +#define ASPEED_CLK_UART 27 +#define ASPEED_CLK_SDIO 28 +#define ASPEED_CLK_ECLK 29 +#define ASPEED_CLK_ECLK_MUX 30 +#define ASPEED_CLK_LHCLK 31 +#define ASPEED_CLK_MAC 32 +#define ASPEED_CLK_BCLK 33 +#define ASPEED_CLK_MPLL 34 + +#define ASPEED_NUM_CLKS 35 + +#endif 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) From patchwork Mon Oct 30 06:02:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 117443 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2190051qgn; Sun, 29 Oct 2017 23:03:43 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QN9tlUfOSxFR/se7P3fKiPL2OME590MQW8BSpoaFm7+o6CPjeWRlJzXRUFiY23MxuzPpPt X-Received: by 10.98.205.68 with SMTP id o65mr7727221pfg.117.1509343423299; Sun, 29 Oct 2017 23:03:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509343423; cv=none; d=google.com; s=arc-20160816; b=Yh2usd5OVHwkubNNR8BJpsNBEDxokq/6ERKW+IQ+TFqi3sVNvlQNKpZXPfEqFMPQDt faWtV44DyJAzk5k4bMB9p1xkYYU38MFp17PY8tLp5RRpG939Ba6K1TBS3+cqrZ/01Bmj jbVgZNEh+wkjSnV/S68a6FrxuRAIM3fajxM+O3RT7AOjEvd195QmpbpDGwQqhlYeWkfc RPZrXqX2O6DWf6Zzny9+F19ZLX4o0wD4/b86s56fhwlWhur5KNuBxM5eFS3JRxn/liZ6 P3Tm/xPjl7tpme/dPhn1VRKaacBtcGprMVn1bBFBUkRN2h4lBENhn67TILfcL28QAJX5 aFgw== 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=Uk79O6/FLTYDZYkocdHwZgqvc5OAQl7TXnNCkHtTQ6Y=; b=rmpWaeJLxnX5n+kVtQlR212BO5fag3/zx7w+CHxlKaFhHmvb/g5vDZQ8+uRY1Ll9ax JHErXFAodRgRDf6sLobQctaXntzKRLi9vr9h/jgKMG5paBc2DabwnkfYltdRqlI3gnX7 JplHLb8XsoAdSlXfp97wK07I2dR93CYhAKPdWCZhM559wFM/v+gh8nf2B3eqmoqD8FJC DmubnYKbeDYtcrWwUHkWO/nHQzi6OlWZrnZHQnYcvLhyQYX2QeFonHNF8nRSIJM6pHqP 5bhYXKTwyKiv9xYOEv6AgJ+KWTxsHAtqub+zdqW/9yjaXI+pkFV+yrqrEBMlJsQgGBf9 Xo6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=mctb8SdU; 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 r10si9246711pge.285.2017.10.29.23.03.43; Sun, 29 Oct 2017 23:03:43 -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=mctb8SdU; 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 S1752341AbdJ3GDm (ORCPT + 27 others); Mon, 30 Oct 2017 02:03:42 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:48642 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752303AbdJ3GDi (ORCPT ); Mon, 30 Oct 2017 02:03:38 -0400 Received: by mail-pg0-f65.google.com with SMTP id v78so10677285pgb.5; Sun, 29 Oct 2017 23:03:38 -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=Uk79O6/FLTYDZYkocdHwZgqvc5OAQl7TXnNCkHtTQ6Y=; b=mctb8SdUgYA2jUgzJEDptyoqc6/VNLQjIvtzI6rw0pn8CpEfueipmoTBG0ARS60rWC t6fYlge3amdl3sTUs+WwLmFcoFUFbrXb4kflraoCdRoyqNRyZV1RA6+dwVNLGmkVHZ7E 9aln07mSTdGO8ij0ZrcETMteTlXpptX1nyIFJYZVHICwc/3NyBKvHZhOM7I34k0MWeXE wa5Kdb91udLRSIxuevJuAw4OqVuCDgYbBQFiGIcFFaINT9tonkoLkcxyPa/rnpvG/xjb TwzI0U9lrfePW+mf00xoqLxAjN0BAjkHfk8BQklzGLNcU5UWmhTs2fVpzvkAlRMhchyx SP8Q== 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=Uk79O6/FLTYDZYkocdHwZgqvc5OAQl7TXnNCkHtTQ6Y=; b=oebXnOczT8TStLFVYKOYeFsW2Yb0MPpMlx//XzyGTATKQB05+cy78o8mXzPiuH8MWd gjJn+E8xenEZGH9/jCz9lZuOF3syOeJx1h8vmlZzwSKi9zKIx0i4LVRuOlFPgs8dEYKo xTrdXSJUPGmyphaJ3AUwV35um+NqU+X8fpH+wxXLC+t5yL4fSwKU8QXZv9TBMhfkw1s8 D8LwFK3pKa3CbL9MA2EWH5+ZQtC/JLX8WCGKCVqDA3JeCgt8t2ix8Q5nCozwSiCbPkF0 rHQ5NNjBqCxk/aanZPTe/gUbZwZ2jZWio4fGH5bNG7jzqQwXtfV0kD3Dmm1o964zMU61 9OJg== X-Gm-Message-State: AMCzsaW6jnV49CIYjH/YQrhHJkrFUgWJkAxVtnek15WUsHHzTH3bEJzh YcgHZ50H5UMxjC1fyUifmGY= X-Received: by 10.98.189.23 with SMTP id a23mr7792223pff.124.1509343417647; Sun, 29 Oct 2017 23:03:37 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id a13sm8698030pgq.10.2017.10.29.23.03.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 23:03:36 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 30 Oct 2017 16:33:28 +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 3/5] clk: aspeed: Add platform driver and register PLLs Date: Mon, 30 Oct 2017 16:32:48 +1030 Message-Id: <20171030060250.701-4-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 a platform driver to set up all of the non-core clocks. The clocks that have configurable rates are now registered. Signed-off-by: Joel Stanley -- v5: - Remove eclk configuration. We do not have enough information to correctly implement the mux and divisor, so it will have to be implemented in the future v4: - Add eclk div table to fix ast2500 calculation - Add defines to document the BIT() macros - Pass dev where we can when registering clocks - Check for errors when registering clk_hws v3: - Fix bclk and eclk calculation - Separate out ast2400 and ast25000 for pll calculation --- drivers/clk/clk-aspeed.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) -- 2.14.1 Reviewed-by: Andrew Jeffery diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c index a8da411326e9..8bf3f3767560 100644 --- a/drivers/clk/clk-aspeed.c +++ b/drivers/clk/clk-aspeed.c @@ -14,6 +14,8 @@ #include #include #include +#include +#include #include #include #include @@ -114,6 +116,18 @@ 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 ast2500_mac_div_table[] = { + { 0x0, 4 }, /* Yep, really. Aspeed confirmed this is correct */ + { 0x1, 4 }, + { 0x2, 6 }, + { 0x3, 8 }, + { 0x4, 10 }, + { 0x5, 12 }, + { 0x6, 14 }, + { 0x7, 16 }, + { 0 } +}; + static const struct clk_div_table ast2400_div_table[] = { { 0x0, 2 }, { 0x1, 4 }, @@ -179,6 +193,122 @@ static struct clk_hw *aspeed_ast2500_calc_pll(const char *name, u32 val) mult, div); } +struct aspeed_clk_soc_data { + const struct clk_div_table *div_table; + const struct clk_div_table *mac_div_table; + struct clk_hw *(*calc_pll)(const char *name, u32 val); +}; + +static const struct aspeed_clk_soc_data ast2500_data = { + .div_table = ast2500_div_table, + .mac_div_table = ast2500_mac_div_table, + .calc_pll = aspeed_ast2500_calc_pll, +}; + +static const struct aspeed_clk_soc_data ast2400_data = { + .div_table = ast2400_div_table, + .mac_div_table = ast2400_div_table, + .calc_pll = aspeed_ast2400_calc_pll, +}; + +static int aspeed_clk_probe(struct platform_device *pdev) +{ + const struct aspeed_clk_soc_data *soc_data; + struct device *dev = &pdev->dev; + struct regmap *map; + struct clk_hw *hw; + u32 val, rate; + + map = syscon_node_to_regmap(dev->of_node); + if (IS_ERR(map)) { + dev_err(dev, "no syscon regmap\n"); + return PTR_ERR(map); + } + + /* SoC generations share common layouts but have different divisors */ + soc_data = of_device_get_match_data(dev); + if (!soc_data) { + dev_err(dev, "no match data for platform\n"); + return -EINVAL; + } + + /* UART clock div13 setting */ + regmap_read(map, ASPEED_MISC_CTRL, &val); + if (val & UART_DIV13_EN) + rate = 24000000 / 13; + else + rate = 24000000; + /* TODO: Find the parent data for the uart clock */ + hw = clk_hw_register_fixed_rate(dev, "uart", NULL, 0, rate); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[ASPEED_CLK_UART] = hw; + + /* + * Memory controller (M-PLL) PLL. This clock is configured by the + * bootloader, and is exposed to Linux as a read-only clock rate. + */ + regmap_read(map, ASPEED_MPLL_PARAM, &val); + hw = soc_data->calc_pll("mpll", val); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[ASPEED_CLK_MPLL] = hw; + + /* SD/SDIO clock divider (TODO: There's a gate too) */ + hw = clk_hw_register_divider_table(dev, "sdio", "hpll", 0, + scu_base + ASPEED_CLK_SELECTION, 12, 3, 0, + soc_data->div_table, + &aspeed_clk_lock); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[ASPEED_CLK_SDIO] = hw; + + /* MAC AHB bus clock divider */ + hw = clk_hw_register_divider_table(dev, "mac", "hpll", 0, + scu_base + ASPEED_CLK_SELECTION, 16, 3, 0, + soc_data->mac_div_table, + &aspeed_clk_lock); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[ASPEED_CLK_MAC] = hw; + + /* LPC Host (LHCLK) clock divider */ + hw = clk_hw_register_divider_table(dev, "lhclk", "hpll", 0, + scu_base + ASPEED_CLK_SELECTION, 20, 3, 0, + soc_data->div_table, + &aspeed_clk_lock); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[ASPEED_CLK_LHCLK] = hw; + + /* P-Bus (BCLK) clock divider */ + hw = clk_hw_register_divider_table(dev, "bclk", "hpll", 0, + scu_base + ASPEED_CLK_SELECTION_2, 0, 2, 0, + soc_data->div_table, + &aspeed_clk_lock); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[ASPEED_CLK_BCLK] = hw; + + return 0; +}; + +static const struct of_device_id aspeed_clk_dt_ids[] = { + { .compatible = "aspeed,ast2400-scu", .data = &ast2400_data }, + { .compatible = "aspeed,ast2500-scu", .data = &ast2500_data }, + { } +}; + +static struct platform_driver aspeed_clk_driver = { + .probe = aspeed_clk_probe, + .driver = { + .name = "aspeed-clk", + .of_match_table = aspeed_clk_dt_ids, + .suppress_bind_attrs = true, + }, +}; +builtin_platform_driver(aspeed_clk_driver); + static void __init aspeed_ast2400_cc(struct regmap *map) { struct clk_hw *hw; From patchwork Mon Oct 30 06:02:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 117444 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2190194qgn; Sun, 29 Oct 2017 23:03:52 -0700 (PDT) X-Google-Smtp-Source: ABhQp+T4q7S0eGVwn98M/XiWt9ijVGD+33dLwL3LsOULFKLgVAMhSLdZBL9wEOTqKEpbaI8umWcH X-Received: by 10.84.234.1 with SMTP id m1mr6413723plk.93.1509343432336; Sun, 29 Oct 2017 23:03:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509343432; cv=none; d=google.com; s=arc-20160816; b=ubCS5NbmbZgybH/nwXi3ShDzvXx0/zPiP/JRz6PvueOiIQLgy1nLdENUNIlEXNCBe8 dJhTgNu2asplc5WASnhx1tPA8vfRKJonh1/9ja+qaQFCljoN6052RdC+0BfwZkkhPHoE qGBnfxF7l7d4jJqt6ukvMzzgnZuRe7KdCu1kTBknz2MDpgVt8JMA85FimAe9iMvjZ5fk 5rBL1mkRPPhi3XdJLrOqRx7ff9IgH2W8FaNAopDm7dihs0PLce+DbtX2yPqCTLvdEpuM 23A6RJUFI/VX1KDaTDkJwX1nchex7WLe5oSy3jHW4hOioiLf9m6svpvW3aKM/VBAwny8 APPw== 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=nYS5XoJ3UKomt8MmyQyZMBs2kaPeYtUM+SszLWO0KLM=; b=x0LltRGbJ8zRgKTHH/wRjnXvPzJYjv3Ia2bQmuLVKk9JjKMOak3txaIqPv3pQMeMiD I0hB5ardmntXHUDahFuTl9qPmMVqPoL9ChHEBG2tAjP7NymQlizAAw/yMTJa5OXD3KJv fQBymVd8nUTZvbe1oHLX26my27ugPUABXVrzWDt45LNSwRhcP37mjJ5wvrfpsQlHvzwG n0k3xAHz2h7zlabFepDpa5OyQbZ61ZzZXy7x6hE4h/uLavXMBcDstFKj3afnWVYi0/+t BQjeYxllwnljpXdHzLdzZ9QUQTSVdsQlvlLHYFjH/mFvwwbl11wXNZYiR9YCCW4KlsCF Lolg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=X5Uh9QjE; 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 t4si9362246pgf.33.2017.10.29.23.03.52; Sun, 29 Oct 2017 23:03:52 -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=X5Uh9QjE; 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 S1752384AbdJ3GDv (ORCPT + 27 others); Mon, 30 Oct 2017 02:03:51 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:55122 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752352AbdJ3GDs (ORCPT ); Mon, 30 Oct 2017 02:03:48 -0400 Received: by mail-pg0-f65.google.com with SMTP id l24so10668864pgu.11; Sun, 29 Oct 2017 23:03:48 -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=nYS5XoJ3UKomt8MmyQyZMBs2kaPeYtUM+SszLWO0KLM=; b=X5Uh9QjEToc8MAIHa2pTxWElT+obNxUYHX1tEJ/HMkT1/BWRFULEAQjym4dy+YJhVm jimXh6Bo4+x08QffdY+/bS4sYYhjyZ77Hs5ID/vqnQpZUdmzkKEz2m562k0XGlzYF9wt Fz1rSfNowyC2YsZk+8e28uPyVppBbOf0SvkmuS6/4tRcDGXAkcaGnF3D07U1IpFfJCNB UCCtuX/Gzs6BtGWCfCKcJA7lk7dlpBK5afBQ5b3z7KRSh3NxS++g1tDcWRQ0veyXjZFk w5WbtijUz5a4KMwMcdxkKfHRm6Vztq18PyIbWcyxovsRxdaO2Pj3GAGVbw/h+RqAYG44 cj+A== 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=nYS5XoJ3UKomt8MmyQyZMBs2kaPeYtUM+SszLWO0KLM=; b=CiSk2022tp5z4uWm845tRaJF+g9gj1sNYSNhy9dEwixd6uPGxzrXmlGPwc1Z3H+VQW KrinqimshNeLwWdh745DKJmkdFPhFza9DMuhTWwWmKLvx4BhDmSZRHJxP9D7IDZPAFUS HKcjVQfpDvUZr/IGuBbxUigDrM+WXn9BYGS7GU310CNNmb0SVmFwjXpXPVlstD8mv5au 9kl71F+NONPtRw9WMD9l+JeZLldYqSgd4rtkwb8W/7T8IfPtr8KkY4WdQn5vmmNxv4Ra oyF/CPPCGP0JlES3mk/kglMQ4H2JIDN3CjPebPKNTpX6dyNZ1lKtQ/rWt8FDWu0FXFc7 w2ag== X-Gm-Message-State: AMCzsaWiumZSI/2BKkgMpLNj64NaKi8c736mzFFI/yjtO9zqeg2FTmBT j8juE6+SuTkARWzh1pfxIt0= X-Received: by 10.84.241.15 with SMTP id a15mr6494982pll.199.1509343427569; Sun, 29 Oct 2017 23:03:47 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id o22sm27504592pfi.85.2017.10.29.23.03.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 23:03:45 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 30 Oct 2017 16:33:38 +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 4/5] clk: aspeed: Register gated clocks Date: Mon, 30 Oct 2017 16:32:49 +1030 Message-Id: <20171030060250.701-5-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 The majority of the clocks in the system are gates paired with a reset controller that holds the IP in reset. This borrows from clk_hw_register_gate, but registers two 'gates', one to control the clock enable register and the other to control the reset IP. This allows us to enforce the ordering: 1. Place IP in reset 2. Enable clock 3. Delay 4. Release reset There are some gates that do not have an associated reset; these are handled by using -1 as the index for the reset. Reviewed-by: Andrew Jeffery Signed-off-by: Joel Stanley --- v5: - Add Andrew's Reviewed-by v4: - Drop useless 'disable clock' comment - Drop CLK_IS_BASIC flag - Fix 'there are a number of clocks...' comment - Pass device to clk registration functions - Check for errors when registering clk_hws v3: - Remove gates offset as gates are now at the start of the list --- drivers/clk/clk-aspeed.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) -- 2.14.1 diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c index 8bf3f3767560..df5bc57a6ee2 100644 --- a/drivers/clk/clk-aspeed.c +++ b/drivers/clk/clk-aspeed.c @@ -211,6 +211,107 @@ static const struct aspeed_clk_soc_data ast2400_data = { .calc_pll = aspeed_ast2400_calc_pll, }; +static int aspeed_clk_enable(struct clk_hw *hw) +{ + struct aspeed_clk_gate *gate = to_aspeed_clk_gate(hw); + unsigned long flags; + u32 clk = BIT(gate->clock_idx); + u32 rst = BIT(gate->reset_idx); + + spin_lock_irqsave(gate->lock, flags); + + if (gate->reset_idx >= 0) { + /* Put IP in reset */ + regmap_update_bits(gate->map, ASPEED_RESET_CTRL, rst, rst); + + /* Delay 100us */ + udelay(100); + } + + /* Enable clock */ + regmap_update_bits(gate->map, ASPEED_CLK_STOP_CTRL, clk, 0); + + if (gate->reset_idx >= 0) { + /* Delay 10ms */ + /* TODO: can we sleep here? */ + msleep(10); + + /* Take IP out of reset */ + regmap_update_bits(gate->map, ASPEED_RESET_CTRL, rst, 0); + } + + spin_unlock_irqrestore(gate->lock, flags); + + return 0; +} + +static void aspeed_clk_disable(struct clk_hw *hw) +{ + struct aspeed_clk_gate *gate = to_aspeed_clk_gate(hw); + unsigned long flags; + u32 clk = BIT(gate->clock_idx); + + spin_lock_irqsave(gate->lock, flags); + + regmap_update_bits(gate->map, ASPEED_CLK_STOP_CTRL, clk, clk); + + spin_unlock_irqrestore(gate->lock, flags); +} + +static int aspeed_clk_is_enabled(struct clk_hw *hw) +{ + struct aspeed_clk_gate *gate = to_aspeed_clk_gate(hw); + u32 clk = BIT(gate->clock_idx); + u32 reg; + + regmap_read(gate->map, ASPEED_CLK_STOP_CTRL, ®); + + return (reg & clk) ? 0 : 1; +} + +static const struct clk_ops aspeed_clk_gate_ops = { + .enable = aspeed_clk_enable, + .disable = aspeed_clk_disable, + .is_enabled = aspeed_clk_is_enabled, +}; + +static struct clk_hw *aspeed_clk_hw_register_gate(struct device *dev, + const char *name, const char *parent_name, unsigned long flags, + struct regmap *map, u8 clock_idx, u8 reset_idx, + u8 clk_gate_flags, spinlock_t *lock) +{ + struct aspeed_clk_gate *gate; + struct clk_init_data init; + struct clk_hw *hw; + int ret; + + gate = kzalloc(sizeof(*gate), GFP_KERNEL); + if (!gate) + return ERR_PTR(-ENOMEM); + + init.name = name; + init.ops = &aspeed_clk_gate_ops; + init.flags = flags; + init.parent_names = parent_name ? &parent_name : NULL; + init.num_parents = parent_name ? 1 : 0; + + gate->map = map; + gate->clock_idx = clock_idx; + gate->reset_idx = reset_idx; + gate->flags = clk_gate_flags; + gate->lock = lock; + gate->hw.init = &init; + + hw = &gate->hw; + ret = clk_hw_register(dev, hw); + if (ret) { + kfree(gate); + hw = ERR_PTR(ret); + } + + return hw; +} + static int aspeed_clk_probe(struct platform_device *pdev) { const struct aspeed_clk_soc_data *soc_data; @@ -218,6 +319,7 @@ static int aspeed_clk_probe(struct platform_device *pdev) struct regmap *map; struct clk_hw *hw; u32 val, rate; + int i; map = syscon_node_to_regmap(dev->of_node); if (IS_ERR(map)) { @@ -290,6 +392,35 @@ static int aspeed_clk_probe(struct platform_device *pdev) return PTR_ERR(hw); aspeed_clk_data->hws[ASPEED_CLK_BCLK] = hw; + /* + * TODO: There are a number of clocks that not included in this driver + * as more information is required: + * D2-PLL + * D-PLL + * YCLK + * RGMII + * RMII + * UART[1..5] clock source mux + * Video Engine (ECLK) mux and clock divider + */ + + for (i = 0; i < ARRAY_SIZE(aspeed_gates); i++) { + const struct aspeed_gate_data *gd = &aspeed_gates[i]; + + hw = aspeed_clk_hw_register_gate(dev, + gd->name, + gd->parent_name, + gd->flags, + map, + gd->clock_idx, + gd->reset_idx, + CLK_GATE_SET_TO_DISABLE, + &aspeed_clk_lock); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[i] = hw; + } + return 0; }; From patchwork Mon Oct 30 06:02:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 117445 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2190329qgn; Sun, 29 Oct 2017 23:04:02 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Si4azui8mcFtfGzZZlfN+lynHtxX9o5cInJ5dN3kUEC5VkFj+SoPLaR0+9dEjve7Y9lq8B X-Received: by 10.99.64.5 with SMTP id n5mr6781617pga.244.1509343441927; Sun, 29 Oct 2017 23:04:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509343441; cv=none; d=google.com; s=arc-20160816; b=rgHLO4LESb1mWWpHclC5GjfHgTCjrPSERcTc802BwXjQ+ytWT9G1TZbwGLrKkElLzJ +aIEWW/rFsXdlFF+JxpG2+Uf2uUqnWtMC8qD/b1ZpnZPjg/Ks3vbLNL3dJ1rhrUQ8iPO HEOlwMebruIsx1ZZKZedXuhYvnYimQ4IzvpAC5P3NarDcAAnN9V9dZWrjJX1blCMgKdU QiFFbYSbf9S/4/tQoC893YDq11QJAPTAj7+q1kDkEjvk5LgRIroXFSyQe9PRiz6erg1y r5BEWN69tDE4Pp5UEbmmSBmOLHze3OKxnJtkaobHK2LMstfZ5h9gPF+iDiFtMO9cXF4q s1Wg== 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=b9m1nmaWtWBwif+xXJu8UuQzESZbAhj4RM3etQ7FUiM=; b=rPo/jqHsJxMdpEFqoTpDbpiUBgTfl30PLrNzkeRregtZW9q/vV7A+deLfhCFBbZ06Y AjMfwBF0KbTFyouuwY1Q0MTx38GSyVjzZWwtfX2GuKtIjT9/IYQstjQAdQ64/HU2qjHV DHlKfQ/WC9p7GNmYiaak9pP2PYOOrW9sAglVCQnJr0lqMheT8w3NtafGmX7F0PPbGFAT srjNKrmSGifopQLGe6/0n/xwb6q/fjWbCw8WNhdXw8nEN6yMrd6vMycA+o4so3gGyVWU vj2y7PxZkzegOw7kLOznUEKkMCJEmGDTgJw+0BiEgTBF1o+e5HrAxA5PHwirWzh26TBW UfrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=C+siZa6L; 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 j125si10107620pfg.602.2017.10.29.23.04.01; Sun, 29 Oct 2017 23:04:01 -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=C+siZa6L; 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 S1752416AbdJ3GEA (ORCPT + 27 others); Mon, 30 Oct 2017 02:04:00 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:55164 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752393AbdJ3GD5 (ORCPT ); Mon, 30 Oct 2017 02:03:57 -0400 Received: by mail-pg0-f66.google.com with SMTP id l24so10669215pgu.11; Sun, 29 Oct 2017 23:03:57 -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=b9m1nmaWtWBwif+xXJu8UuQzESZbAhj4RM3etQ7FUiM=; b=C+siZa6LS6+EmC6xEqoIo6+mnu7vsUyCNDPH3Q6JOX119Kh2pddAVWTIU6vhS+Ty61 zGA98koFcnOtFTCZC6DYhvkWWWoz7uZjVWimdYP8JovfX1pl01hSBj017yZJJ9/PMxhn umiR9h3UsdQBPLZMzeGR4lO+gTQt9+opyBpUXWNmR3fVx7IA0WOIvtN6g7RrhC3IE+q1 E6GDg3plXJukaO7M5Gn/ws5RRs5feDgVmMeOwkqe1Zb2Uf190rh5wnRMu6Ot0s6ON077 3hq4cRJXwSs3eAShB+RZvC7ySjbkyVDKKFKDtaW87zd11oUjOwrTOeooAMxNHw+aSqtq 0xWA== 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=b9m1nmaWtWBwif+xXJu8UuQzESZbAhj4RM3etQ7FUiM=; b=irDsYEPuozFLZSZdNhbcNr/lex6FnYp69zEm4sxw1pPRCY6Dkp3EWcIxLS561/h7JN vs1CWbILC/qF8eY1js+faHMn/ABlHAltbC7/jcJo4JPP2wHZPdxQtbgfe11oucTq0QMk cWEToTOPXULWLu+V9uf3QMBKWf9ajWWhE1o2+h4AGqQ3yAU0rUkg/caHt4ypkJKuW5g4 /IAtf1aPfxjFIA4qpqFbtBN0Zj017TrWsnsriPZT1fM6K4EXfF7LZckgsKOoerXetpUz reDW6VSqeUC8QwkzycPWOmvuY0TmQDySqK/zA10KikPddV6hqZsSJKhnB05pXWnsuUvz Acfg== X-Gm-Message-State: AMCzsaUN3itNB9voseDqcI3weZOQ070sTOVGRtB+6M0WjIU6kxm3ivpr iDMCHrwpZMB6w2rvTDb4wjg= X-Received: by 10.84.213.9 with SMTP id f9mr6257321pli.76.1509343436987; Sun, 29 Oct 2017 23:03:56 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id f191sm3130794pgc.32.2017.10.29.23.03.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2017 23:03:55 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 30 Oct 2017 16:33:48 +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 5/5] clk: aspeed: Add reset controller Date: Mon, 30 Oct 2017 16:32:50 +1030 Message-Id: <20171030060250.701-6-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 There are some resets that are not associated with gates. These are represented by a reset controller. Reviewed-by: Andrew Jeffery Signed-off-by: Joel Stanley --- v5: - Add Andrew's Reviewed-by v3: - Add named initalisers for the reset defines - Add define for ADC --- drivers/clk/clk-aspeed.c | 82 +++++++++++++++++++++++++++++++- include/dt-bindings/clock/aspeed-clock.h | 10 ++++ 2 files changed, 91 insertions(+), 1 deletion(-) -- 2.14.1 diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c index df5bc57a6ee2..d91e86c70e0c 100644 --- a/drivers/clk/clk-aspeed.c +++ b/drivers/clk/clk-aspeed.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -275,6 +276,68 @@ static const struct clk_ops aspeed_clk_gate_ops = { .is_enabled = aspeed_clk_is_enabled, }; +/** + * struct aspeed_reset - Aspeed reset controller + * @map: regmap to access the containing system controller + * @rcdev: reset controller device + */ +struct aspeed_reset { + struct regmap *map; + struct reset_controller_dev rcdev; +}; + +#define to_aspeed_reset(p) container_of((p), struct aspeed_reset, rcdev) + +static const u8 aspeed_resets[] = { + [ASPEED_RESET_XDMA] = 25, + [ASPEED_RESET_MCTP] = 24, + [ASPEED_RESET_ADC] = 23, + [ASPEED_RESET_JTAG_MASTER] = 22, + [ASPEED_RESET_MIC] = 18, + [ASPEED_RESET_PWM] = 9, + [ASPEED_RESET_PCIVGA] = 8, + [ASPEED_RESET_I2C] = 2, + [ASPEED_RESET_AHB] = 1, +}; + +static int aspeed_reset_deassert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + struct aspeed_reset *ar = to_aspeed_reset(rcdev); + u32 rst = BIT(aspeed_resets[id]); + + return regmap_update_bits(ar->map, ASPEED_RESET_CTRL, rst, 0); +} + +static int aspeed_reset_assert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + struct aspeed_reset *ar = to_aspeed_reset(rcdev); + u32 rst = BIT(aspeed_resets[id]); + + return regmap_update_bits(ar->map, ASPEED_RESET_CTRL, rst, rst); +} + +static int aspeed_reset_status(struct reset_controller_dev *rcdev, + unsigned long id) +{ + struct aspeed_reset *ar = to_aspeed_reset(rcdev); + u32 val, rst = BIT(aspeed_resets[id]); + int ret; + + ret = regmap_read(ar->map, ASPEED_RESET_CTRL, &val); + if (ret) + return ret; + + return !!(val & rst); +} + +static const struct reset_control_ops aspeed_reset_ops = { + .assert = aspeed_reset_assert, + .deassert = aspeed_reset_deassert, + .status = aspeed_reset_status, +}; + static struct clk_hw *aspeed_clk_hw_register_gate(struct device *dev, const char *name, const char *parent_name, unsigned long flags, struct regmap *map, u8 clock_idx, u8 reset_idx, @@ -316,10 +379,11 @@ static int aspeed_clk_probe(struct platform_device *pdev) { const struct aspeed_clk_soc_data *soc_data; struct device *dev = &pdev->dev; + struct aspeed_reset *ar; struct regmap *map; struct clk_hw *hw; u32 val, rate; - int i; + int i, ret; map = syscon_node_to_regmap(dev->of_node); if (IS_ERR(map)) { @@ -327,6 +391,22 @@ static int aspeed_clk_probe(struct platform_device *pdev) return PTR_ERR(map); } + ar = devm_kzalloc(dev, sizeof(*ar), GFP_KERNEL); + if (!ar) + return -ENOMEM; + + ar->map = map; + ar->rcdev.owner = THIS_MODULE; + ar->rcdev.nr_resets = ARRAY_SIZE(aspeed_resets); + ar->rcdev.ops = &aspeed_reset_ops; + ar->rcdev.of_node = dev->of_node; + + ret = devm_reset_controller_register(dev, &ar->rcdev); + if (ret) { + dev_err(dev, "could not register reset controller\n"); + return ret; + } + /* SoC generations share common layouts but have different divisors */ soc_data = of_device_get_match_data(dev); if (!soc_data) { diff --git a/include/dt-bindings/clock/aspeed-clock.h b/include/dt-bindings/clock/aspeed-clock.h index 4a99421d77c8..8e19646d8025 100644 --- a/include/dt-bindings/clock/aspeed-clock.h +++ b/include/dt-bindings/clock/aspeed-clock.h @@ -39,4 +39,14 @@ #define ASPEED_NUM_CLKS 35 +#define ASPEED_RESET_XDMA 0 +#define ASPEED_RESET_MCTP 1 +#define ASPEED_RESET_ADC 2 +#define ASPEED_RESET_JTAG_MASTER 3 +#define ASPEED_RESET_MIC 4 +#define ASPEED_RESET_PWM 5 +#define ASPEED_RESET_PCIVGA 6 +#define ASPEED_RESET_I2C 7 +#define ASPEED_RESET_AHB 8 + #endif