From patchwork Tue Oct 3 06:55:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 114661 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1540627qgn; Mon, 2 Oct 2017 23:56:26 -0700 (PDT) X-Received: by 10.159.211.76 with SMTP id g12mr16631603plp.312.1507013786156; Mon, 02 Oct 2017 23:56:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507013786; cv=none; d=google.com; s=arc-20160816; b=KIMPiMNF9ETZ9bGJfbldZFmGublEMpTA1guHfrf7Icd4ozmexOEPJapo2BpOCnLY/M bsNJvs3Ee21kEm6xOIL8pxjRjBpLXcjw37jVH8g1AYr1WjPVywW+nmWzbnqfRXuHCSp6 6ZFkAxzD+BfHPZ7PTr96meKyoc8OTz/pVZp/jPQPYO+WV8lpbXtBHlhA+uoan3E1w6gT 2R7LOFy9KrF/SdnbsZThFSXmHMfljtg0cdoHmmBrpbH6L+P9QZD/CdRAryIxS9XA7H2L XN6Gepq57kIMH+3h2BfeUJQhhhwFqVBrqqEkAvtvLaVTBtSmv/7gQFn6GU6GbVBqiTcd gEwA== 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=H06m81Sn8n0ZjcLIWn1Dk103DKIIteETZepMQ4TPPbw=; b=ykQKPptdzJljViVVTBxv+9qAdTbaXZ+0DFJz2HocPIls55v5JKLBJjYl2sT9OccUEh Tz2G1a19ilZHywQ53NO5i2mlcumjFyhgtt9uyUaRBpuszvYAg/DfuyYv2O31pPguJ1Zg I6lFd/N09eKph8ELIyN5jiRn/wslAT/EzfsmGbpjjoJTzHxbJ+mMOcJnFReyDwa/ZSey Bk2XAp3kyjCRJdquLIZcKpwzq3GBA26EHGYk8gTMVMu2J9fxyPVCR3o890V/HT23SV8E ZpIgCAu9eXHunORBHIHxZUlAMrnNhp/3hbF+2XJNc0kL/sC8rxFdaDrWUskKN095pTe+ 60gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=YdlHiSf4; 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 m2si683425plt.5.2017.10.02.23.56.22; Mon, 02 Oct 2017 23:56: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=YdlHiSf4; 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 S1751169AbdJCG4U (ORCPT + 26 others); Tue, 3 Oct 2017 02:56:20 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:34452 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750820AbdJCG4R (ORCPT ); Tue, 3 Oct 2017 02:56:17 -0400 Received: by mail-pg0-f66.google.com with SMTP id u27so8477671pgn.1; Mon, 02 Oct 2017 23:56:17 -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=H06m81Sn8n0ZjcLIWn1Dk103DKIIteETZepMQ4TPPbw=; b=YdlHiSf4r5lPVfIN8nwOWJzOeZ1PkaBF2PHIaY98GyU/KjfShClMMOSQ4E8Nmk3Oqd TPGq4pihzvFrBqPkBJBHBHphYUHske1X9lLbI8kJKyPcEMVpfqVRVkolJ/wiwHkDz3Xy Erv1YJbEgcrcf47rFLRYlvwWj1z1W6wuqYRVbm5M4S/D8wr/2lyeqEZfe9UcyRENnq0t zISL72KoZjk9nv3IhCEzUBH8JIeZRGC0LbxVNuq7WQTIrhbFeAgY/EVXlbyXDipSRc5z UrnsjTk7iTen6EE55mzldyJsp+sOOv0hIbB0x14Ehv2MuUypqXVgAD8SOvORi+5AvslX tPjg== 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=H06m81Sn8n0ZjcLIWn1Dk103DKIIteETZepMQ4TPPbw=; b=BuX1HuEtXKTnQ+ednhCSEylKzhqfIZ2u8iXMv/LKICIbI1kHyzP+mwvJwSXUVzmbX4 s61PS4B0sQUxJjQvNYiU9/PGjNabUpkxBOp18ooQlqa0IIkuqeae8/41jqiic/aLf3kb 2r1g7V9XzqlT+46IbpTe3FYZO7nmR/HdtMYl+VKM2cyXG8IAcy8dPSk/sGBvxtrE1yUi 9j28KY4YY+py/qSiaJ7EeBBydVoz0Sqw9GZqtHQvVNPCIvVaGh5ChzWSdRUw3JQRM9ar g89ifZWpbWam4oo4d7eWq1fQ7KV+AHIUEtRnVznkqLwK7UEIQhRAy2cD9fdr/Nq8Z2VY aQXw== X-Gm-Message-State: AMCzsaWIksiLTPySkSyvkgNOiJQWKJEacSWa7IGsgqqmN3V8IeZy86HZ ttsj+BWbuknBfUZsxk4WtPU= X-Google-Smtp-Source: AOwi7QAJMhaS4vvu/zXIhO46oijHwjh8tEZnT0ECqulv3fcj7/JUYJ3i1xe5QaPDf7EhpyQmy8h/6g== X-Received: by 10.98.201.140 with SMTP id l12mr5981191pfk.4.1507013776814; Mon, 02 Oct 2017 23:56:16 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id m67sm19615328pfc.38.2017.10.02.23.56.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2017 23:56:15 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 03 Oct 2017 17:26:07 +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 v4 1/5] clk: Add clock driver for ASPEED BMC SoCs Date: Tue, 3 Oct 2017 17:25:36 +1030 Message-Id: <20171003065540.11722-2-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171003065540.11722-1-joel@jms.id.au> References: <20171003065540.11722-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. Signed-off-by: Joel Stanley --- 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 Reviewed-by: Andrew Jeffery 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..a45eb351bb05 --- /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[] __initconst = { + /* 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 Tue Oct 3 06:55:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 114662 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1540684qgn; Mon, 2 Oct 2017 23:56:31 -0700 (PDT) X-Received: by 10.98.233.10 with SMTP id j10mr9034452pfh.317.1507013791039; Mon, 02 Oct 2017 23:56:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507013791; cv=none; d=google.com; s=arc-20160816; b=Hp/Rebcu1fdMfWrpaKYIUKQ+rFOhRCbkd58bpEOBNrDbBw33uW6h5/niFsdcXYk2bi 0VybCJcXKBH+8PgIb9NJ0xCabf9kxApNYyTb4XbRTgpR7zcQRxsCHelggcbQaI6OaVmz llyD1IeWx0WDHnaC8FC3uo1OMBQnzcIOQu2qXQSnl9s1G4p/KZx1c4eSJHXnt6wDrhgU krlUdYAnCSBnmK2GuXdcVytCYS7dnmFEvW6tQ8GSXwHFRQ/wIUTmXzecb6kGYnOH8dtK m+ycE7FvvwMzgxRWgmclJWfCqAttP6H3u5aXe3vphUJ6tAoPRh1JtArv5yAEjkLbZzB2 s7mw== 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=RlGlalJksVUWJPjGT5fUin70Zm3gJnxIwwKJTBvTPHM=; b=yfFUPqw0kY81V/W0H73/WGBqkWMl/F7RwFk7omL9pJKrQ5YUGgua38wDpY0kZ6H1If AHftd02oLTcpz8E/y3prcKl0Qgwbklca6dbwN/HoF+ILZJGLNF2PoZuoJcew2kA38nc7 O595ioURZNvWU3qVBGFatgeFdP071ouoIJvgH6+EkEcjvi3NXBDOecBcRJmVqT6Ew265 dlWY7serC21v8NZXo4RTB4WkhQi3JIncvPBMOMU3FsP0bKFEddYlyj6PyBevV9j1JwaZ CywCj38xyAkFjIi8DEyfYOJ7vUqBEuFZqIGlhzKoyFMte2iGhVUnF7fBJXizEjbEfCJj bxQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=a3+ttZZc; 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 b3si6675079pgr.350.2017.10.02.23.56.30; Mon, 02 Oct 2017 23:56:31 -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=a3+ttZZc; 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 S1751207AbdJCG42 (ORCPT + 26 others); Tue, 3 Oct 2017 02:56:28 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:38812 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750812AbdJCG40 (ORCPT ); Tue, 3 Oct 2017 02:56:26 -0400 Received: by mail-pf0-f196.google.com with SMTP id a7so8124245pfj.5; Mon, 02 Oct 2017 23:56:26 -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=RlGlalJksVUWJPjGT5fUin70Zm3gJnxIwwKJTBvTPHM=; b=a3+ttZZcwEU0xxrILQ53Zop66x1KHnrmUR552XAbYpk0cs/fbhmBTGWqMUCSbcMfup b4gVo+ec9+Y5kJFWTGjB0PiMywvTWmr2Jo5qn4a0iVtWIq5LWaaSDfUiFb0/4nGZJdoU Z+tgNPFwgZS/jWwtFK62FF08vm1nn2E2Wz0sfeqS+nUsmB/WLE2wexXcjRGbRBLW+plJ 4wXCIpnfjAtIVCChTclTcpbtJGJBy1XwNCdQlBmcJNYW5oKEFyu1zqPp/629rGYZ1ln2 2zA2MKJVT5ih7u3LH0gUegXlvzHHT69i9qtKJb3yo3uOsun/pLiHeHsSbnb533e/d9pW mwxQ== 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=RlGlalJksVUWJPjGT5fUin70Zm3gJnxIwwKJTBvTPHM=; b=ln95DfvsPGn6phqKYzGzfV5azw5bnYLzqqT7cGaaTMtn8mSwQtfEYNQVaZ26GoTRkv BrPpydMNhAm11cJUV+WAq9xIAhn3fmtPL3exH9ZQUXq58RXaFfK5mxn+PXObmu7tFp+c Jf+rL/KSV6g8CM9/apXZTKLXucdT5MxrMPyWtwMGA/pHr22MJrk49gPhy++VBOou7sN/ 8X3NL0c3aaGbKKS3dikeuwq+SOfBVHYnAkBlqM14SupfNKpztVCEo7ZX6Wwzh+G9S7hJ CjxTjMX97CK+oJQ83CxDxf5QcF0QQ5AEpT6abrKZs2WfM0y9nv6SXmkL6CgmQnTBWh+0 bFhw== X-Gm-Message-State: AHPjjUhFD9aaTaWupoM02LpsHOOQnNCI3doh7tjwT95sJqf+0ZpNk7Ur zCI7jaLy+1AuqEAhLnCwgTk= X-Google-Smtp-Source: AOwi7QAbB/JvcPG+7ktBL0DFqneVT/Q5CKGu0Zft8klxreI6dZUQJACzRpHyW89N6cgh8wxbwujbjg== X-Received: by 10.98.62.80 with SMTP id l77mr16536193pfa.267.1507013786226; Mon, 02 Oct 2017 23:56:26 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id t17sm20237368pfi.31.2017.10.02.23.56.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2017 23:56:24 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 03 Oct 2017 17:26:17 +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 v4 2/5] clk: aspeed: Register core clocks Date: Tue, 3 Oct 2017 17:25:37 +1030 Message-Id: <20171003065540.11722-3-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171003065540.11722-1-joel@jms.id.au> References: <20171003065540.11722-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 --- 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 a45eb351bb05..d39cf51a5114 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[] __initconst = { [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 Tue Oct 3 06:55:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 114663 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1540789qgn; Mon, 2 Oct 2017 23:56:39 -0700 (PDT) X-Received: by 10.98.23.75 with SMTP id 72mr16594320pfx.68.1507013799804; Mon, 02 Oct 2017 23:56:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507013799; cv=none; d=google.com; s=arc-20160816; b=swW/9nlOieXHXHo+xepURbGT6C4xLvvJE4qNDaGseBGZupS8WyP8GAiPGjmBTFxffW AU/D6cXopx+Bkjs93kEOtQcvQwtu2KZxJXQIA7wVN4dwTJK4Lp3mWWgmlcKWd0hqwjo3 hzfhcboD3pWsdWX3JRaA4db++Sv5nfVYB48nU4lQ6+Tca2c+j6fXikE/BwEHO6QiOkgY epxFxOAd+ICFGOfwEMIvOwYr1MqA9pkxqoyu6etMh1W6+NK/i8+EQ61dvcCcy+OhZLbV Fw7kjDG+GwrRAt1pYkNFYX374ruKUILrACizphw3g6mzH3EXMv8dmAB04RpfrfmXI4PD Mqkg== 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=4lUaI30R32aYky+YmHAhMPFkS08klxHK91VU3kv527M=; b=upSHKwLM0qcJ05NIkuDfFSfT61T/4VMu/19UQOWBnPY7fIKUjoNshdxqXwgTAi+t20 BEYhFqCYaswtL9+y6p/xkUmfQfeq/GYB5oS+fv3qGN3p2vatmJYJ9ST1EHzU6yw7aSsN /2o9FXvvNZ3zWKir3lIP3Y09n9Qg0p1TofAx4NLXHGzScPsrqp+jOMeigKN8LS3Mra3X H4+YehkULS3sJeGgbcqrEQg6PHVv4FAh7MVYRvDXcqnCWdNlT6j57H0MJy00rqwX8gxS e0BH6Hg5+Wjdcs4e/5BZDZxcLtUJXWbFwCLPTPX63ftRSwzWk9PHD7jroteWUBs1Zeu2 4gtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=FzwtrsUL; 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 b3si6675079pgr.350.2017.10.02.23.56.39; Mon, 02 Oct 2017 23:56:39 -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=FzwtrsUL; 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 S1751265AbdJCG4i (ORCPT + 26 others); Tue, 3 Oct 2017 02:56:38 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:37873 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750812AbdJCG4g (ORCPT ); Tue, 3 Oct 2017 02:56:36 -0400 Received: by mail-pf0-f196.google.com with SMTP id e69so8119412pfg.4; Mon, 02 Oct 2017 23:56:36 -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=4lUaI30R32aYky+YmHAhMPFkS08klxHK91VU3kv527M=; b=FzwtrsULDufHNGvN8XAx84zunDE2fD4pD+RiSeXeRUYxsTaDzERALesIgxLXEYY2s/ 7UhVY1yYfyTdltuG1zY8xLrDTGovVI50or1ghAKXy+rnkVRN3JXQ/E6bOTd0iv/sJOjV 2tj0bbUOYDqiQnzA8jDIUqhilJRuqBg7b4kdNQV9HHqMu1UnDjWjORI+s69kGKwVb6jl CciBxFVqV0kln4zVGnN3qJCG4LOTXAoz4eqYPm1y9WrKIO5uI8JmCy4ofERfwUU34WYp EWQ5d2lijgvsNHNQn4BKvbOPBNTl1P9212CK9+JFo/t9dd3fLKvPLsX9WwD65VzVEdTj yp4w== 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=4lUaI30R32aYky+YmHAhMPFkS08klxHK91VU3kv527M=; b=YrY00uIbYBYnMkUplORMsQmRmmleLoy48dEG8MEHgHjyUBw2yJJ6glvrVP6psrHMVp Wi4yPSdQpnsz/Epl4WNTJ6oBI7o3LOnabEAhjfr0saozR5y+nCTabzrKZkNuzwOyKEtS bCRaD/P114beZjg7xgboWVaSYruo9Aw8US/AVBpZthAM91eyJXzOOmYw2cvB/QRJnnoO hZ7IVSgFzElSqtKPBpayPj9Ay1ohP9fdnKNYe3GfaJ2J5ZIGyW/nC4n4vtuR/VKkYlrk YX7pCG+i3S8ee2CKjUwMap0zR8DzicfWuoDkSoHmTsMlcBL54YLDY8Aiz+8HBAhSbRn5 VHSw== X-Gm-Message-State: AHPjjUgRtrbFqlSOhW7iS4eeFTOdS/lQ656Z3kpyShh59/larAEWotH8 2lYKD5tpghpoc+u86FVysaw= X-Google-Smtp-Source: AOwi7QBClOF7xygbkumngpp3pUveXOkITGA3hY64VsDkZKaDA1/BOn3L+XFjUi0mxgqniuZy1fv/WQ== X-Received: by 10.84.235.9 with SMTP id o9mr15797564plk.8.1507013795681; Mon, 02 Oct 2017 23:56:35 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id e133sm20245887pfh.177.2017.10.02.23.56.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2017 23:56:34 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 03 Oct 2017 17:26:26 +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 v4 3/5] clk: aspeed: Add platform driver and register PLLs Date: Tue, 3 Oct 2017 17:25:38 +1030 Message-Id: <20171003065540.11722-4-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171003065540.11722-1-joel@jms.id.au> References: <20171003065540.11722-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 -- 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 - Seperate out ast2400 and ast25000 for pll calculation Signed-off-by: Joel Stanley --- drivers/clk/clk-aspeed.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) -- 2.14.1 diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c index d39cf51a5114..adb295292189 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,32 @@ static const struct aspeed_gate_data aspeed_gates[] __initconst = { [ASPEED_CLK_GATE_LHCCLK] = { 28, -1, "lhclk-gate", "lhclk", 0 }, /* LPC master/LPC+ */ }; +static const char * const eclk_parents[] = {"d1pll", "hpll", "mpll"}; + +static const struct clk_div_table ast2500_eclk_div_table[] = { + { 0x0, 2 }, + { 0x1, 2 }, + { 0x2, 3 }, + { 0x3, 4 }, + { 0x4, 5 }, + { 0x5, 6 }, + { 0x6, 7 }, + { 0x7, 8 }, + { 0 } +}; + +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 +207,141 @@ 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; + const struct clk_div_table *eclk_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, + .eclk_div_table = ast2500_eclk_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, + .eclk_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; + + /* Video Engine (ECLK) mux and clock divider */ + hw = clk_hw_register_mux(dev, "eclk_mux", + eclk_parents, ARRAY_SIZE(eclk_parents), 0, + scu_base + ASPEED_CLK_SELECTION, 2, 2, + 0, &aspeed_clk_lock); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[ASPEED_CLK_ECLK_MUX] = hw; + hw = clk_hw_register_divider_table(dev, "eclk", "eclk_mux", 0, + scu_base + ASPEED_CLK_SELECTION, 28, 3, 0, + soc_data->eclk_div_table, + &aspeed_clk_lock); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[ASPEED_CLK_ECLK] = 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 Tue Oct 3 06:55:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 114664 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1540891qgn; Mon, 2 Oct 2017 23:56:49 -0700 (PDT) X-Received: by 10.84.151.68 with SMTP id i62mr15986847pli.179.1507013809784; Mon, 02 Oct 2017 23:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507013809; cv=none; d=google.com; s=arc-20160816; b=KkoCte/STQ8sfvsKBwsCgp2Qfkd5Sj5tosu9pQXJz3YiyV6aFIYvajWYcn78uCY1Sg JPrSm022vpdU2XBpryWeo5A6zav1KDnvJ5KMIdHhM0T9UfxtwG2wYygl0tDoOD1rAeEc +a5vyFClyfX8F8yDFEi8aCB9KbH/uZjMZxKs8tiuKePfNP3GeItS2I7LVeuvOCnvIT5Z 5iz6zggY2zpZAcb23Ys8atRY42R21d4ejl3o6MzdXB2wyooPeb4Zp00sZ7//A3PEaSZQ dmjMVky/7CGXNQyyNW1UNMt/rJ7RK0dDkgJfOWPHf98sXgR+ir10gtz4XnA8KAcq86RO 36xw== 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=hjEcFKTT9PaVOvEKoj6gVSwkNjyog+673B9+xTLMJv0=; b=t7vLVRng6EefvARbtOSsocrvEpr8JUZRiQolC+6zcn7JY6NsctQ4XbzQEcoiQgoBAI slLpTS/tUN94r/IokIN0BtJxg7LksP77nKJBlSnB3QHpFBDh/+sZOMITJoq+IcthGbe7 J6pZ/OBBppTTsyIRb3Sn2ywgBObOYg8VY6ixL0BTqdjQ6TyPzsqJ5I9DDSnjvdoTvkki luJcrtE7RnzhUhDvLWOIIZvvHJ055HXlABwyA1jXYd4/M3bHYgkHdQ1S1JOjA9HLxsxz cA4WvSsDxvzXM7qeeLpk65DjX0MBCZPZfyFK9vTw7lIPyixwDkYh6ZoY9M1sjCWv8AvN tToA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=q/QXSQ/v; 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 i87si9208157pfi.397.2017.10.02.23.56.49; Mon, 02 Oct 2017 23:56:49 -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=q/QXSQ/v; 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 S1751345AbdJCG4s (ORCPT + 26 others); Tue, 3 Oct 2017 02:56:48 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36418 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750812AbdJCG4p (ORCPT ); Tue, 3 Oct 2017 02:56:45 -0400 Received: by mail-pf0-f196.google.com with SMTP id f84so8133304pfj.3; Mon, 02 Oct 2017 23:56:45 -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=hjEcFKTT9PaVOvEKoj6gVSwkNjyog+673B9+xTLMJv0=; b=q/QXSQ/vxVlA9kOI76k/7U69ho4hLaLP3xPfIznJ7nnmStipfNZOUt/gvZ//YFsPXk zhOeSuoHcwE8y0lh48Xx2q0KTsLeeSRugOe0prYagy/HSaFcLqMoVjfjGtn+bk1oMswD AvY3bKp7XZvQilhZ7kIU7Of8xKKIwzIr6ywbUcoQYlnp8ollJAIi4flVqNDJO9LTIYz2 VWb/+2V6bWNl9oW2a91wedHsmalMTTY68C94tHgGqndVf8kUcdCOcoshJGmXwzF59uZ5 SLbAT9hbP/MaECshdeMJxoHdN52omwgNcXdxrTFGAUQsN32tUqdSgYLCjEqpqFMqC886 WOHw== 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=hjEcFKTT9PaVOvEKoj6gVSwkNjyog+673B9+xTLMJv0=; b=n+NemUodh8FqSOR68QBAEzugmpeAUV21gM7AevqnwCpD4Yklpil2RCGNXHzd15ShdN af+rvzTfvS1WgyFflAM/mc1dyKpJJiwPmjxm1Xeq1SHyeBtynDgrKe7s4IntmiFn+4s9 XufA9qqWzKNB4XzUSdhSGlaCsSNHjse5/duajxAEuZ0/4DZOLX6M/EpcYqShVtWwmggP vlHHUvmJB+0PMYo19U/72OBVD/7JmDBbIAv+DVYuqqe3gXd5LVLWEdDfCgdSky1Gwpa+ ciM2H4yCkTVMa1gn396DNfG0TWTIOt7C5D6tNMeeO0V8vPVx0LeCwmd/F72OPhSUDD1N qpIw== X-Gm-Message-State: AMCzsaUHnprKR/q5K2afblHTSUPZ8VdT1wRPindMEjTIEeeL36cZEwPH 9Z8gvNDxycvgbDId8ZJcAlc= X-Google-Smtp-Source: AOwi7QCgFm4WU8unindTlET7d18GHols3z+TM3kNT1jJLl5yxOm63PKRncPJIDvIpKJvOtGWSn4zgQ== X-Received: by 10.84.228.193 with SMTP id y1mr7290582pli.301.1507013805256; Mon, 02 Oct 2017 23:56:45 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id i10sm18530758pgo.71.2017.10.02.23.56.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2017 23:56:44 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 03 Oct 2017 17:26:36 +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 v4 4/5] clk: aspeed: Register gated clocks Date: Tue, 3 Oct 2017 17:25:39 +1030 Message-Id: <20171003065540.11722-5-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171003065540.11722-1-joel@jms.id.au> References: <20171003065540.11722-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. Signed-off-by: Joel Stanley --- 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 | 130 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) -- 2.14.1 Acked-by: Andrew Jeffery diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c index adb295292189..a424b056e767 100644 --- a/drivers/clk/clk-aspeed.c +++ b/drivers/clk/clk-aspeed.c @@ -228,6 +228,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; @@ -235,6 +336,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)) { @@ -323,6 +425,34 @@ 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 + */ + + 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 Tue Oct 3 06:55:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 114665 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1541012qgn; Mon, 2 Oct 2017 23:56:59 -0700 (PDT) X-Received: by 10.98.245.74 with SMTP id n71mr16723924pfh.102.1507013819760; Mon, 02 Oct 2017 23:56:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507013819; cv=none; d=google.com; s=arc-20160816; b=PvN84aw75vj3uHHXuvEMPLCyllUDhgCy7OOuUV1zMjSc+uquJHGkynMkq5NwzZBaik wupn+jtpdWqoJXh7b2tyo/fuloUDQGRKiqiE/5JFkM8x4Wjjl9IJbexuVwi0mkxTiZSZ imJXiv90lSFU6nT3JSTTyc40iHu6ZreV+3cmRw2vJanscZK7q3nk/VT7JgGnYxIfA5DR RflMN8CUan3hr53SLSQQtBUgfHPrDJfNqNxwC0IXFpARhvg/w5AW7giJenmEESVkIEvN n/A2wGcwSQCTR+IRvaRZo/wpmUEIY5UNjXeUfcwBopWIXZeUOLafdndqznUvzyD8bU1D /0Aw== 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=dXWfK5cgpGP1CPVj7BnVdmt3eO24FuR7QXjlsRClvBQ=; b=DahVEQH+VwMR04ICLjJNxqefhkRIizC13C5xaACr1vp/czFS7OHuvWRj02v/QpbAmc k03cCorzZXQtcagqCJRotAv1NKpJCzSz/T3+VQjvMnssz9qBUnUFRHOWeMj6ktx0vz9i 6eBPPp3hhv0zcKQrl3RAQOyUPadEdnppeFnJs3kbXcuorswxCAEr/4m60NVT+QJDaN8R Q9P5dBxzaVICg5wV+4A1l+XDBes94Let8UJHpyWYic6B9U0KYBDQDr08rIEEhyibv3iM c6gGtEXacBLeJAPRyEb2RpZF0HWaN0xRftc2mLVeac8VC3QL9iQ5G6s7uYwjCnvqamZj SefQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=OsrErUm/; 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 f188si2076105pfc.30.2017.10.02.23.56.59; Mon, 02 Oct 2017 23:56:59 -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=OsrErUm/; 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 S1751418AbdJCG45 (ORCPT + 26 others); Tue, 3 Oct 2017 02:56:57 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:36497 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750812AbdJCG4z (ORCPT ); Tue, 3 Oct 2017 02:56:55 -0400 Received: by mail-pf0-f195.google.com with SMTP id f84so8133644pfj.3; Mon, 02 Oct 2017 23:56:54 -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=dXWfK5cgpGP1CPVj7BnVdmt3eO24FuR7QXjlsRClvBQ=; b=OsrErUm/s/MHHWta2ekFfGQZOyKvr3oVBvLEFLUWvSLVVZuZhvv0SRVLTRH+L9Mgmy uTgDpO5KI8k5jWKYb7yIIRTiJ+THzN04+Z6qCOQX7xLN0QU2FPD25gYY7LnAaU8fS1Jp F29/N6QfiuJqFP7v6LkllEVTdcmm/1kSsejHV22pvXvTGJGDqeQJfuE7HYz5JJqn7fr0 h0GCna5n/VUxH5EflvDhIRnHwn3NR+7CKPvnmdFx2tfoG71MXkhbvyV4Od05d/selXVT xW4uQp7Zh5F5FMAePec+0j8qh+30vj2bw6daDcTDb9MutLA7AcwDctA0dx45LN3Zhaap W4SQ== 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=dXWfK5cgpGP1CPVj7BnVdmt3eO24FuR7QXjlsRClvBQ=; b=gI8QVXYnM9y8dNyeVYnTiLFHLssKhLuDiRGEycdlLLHSj1xJRdZ9ml/r7RoDHajQzz 8z8fEXkj/+5cdVZ5kRVJWLSZm4/GVarfb9AAk9QOmPls7qmcZCQ058vMIQvllWPZfVC7 vEqPFAOHZu9VRqQz8c0qsrydZF5WhdKOPl7gTPLsUgJ8x0atcFa2fGwUTm4ZtqOQNCrs OmGrgCIpvcLuHw+phlq7idfYeXVa3a2hjwvrEIxCE6+FgpHbMfDGpN07zuoy6H9CDelp GFk1PZds7bDcGF2SdcrOrp2pAa0Sup96RIeY119mriUMTXBe8IVZES4/A9p8ffWudZbs KPhw== X-Gm-Message-State: AMCzsaXEWhPo5N0RoKVMf9yxxO28OxxlsAYa0XVUdNoss4IaMTz9Bcob fcvwER9QE+lurOc5B5vuSgg= X-Google-Smtp-Source: AOwi7QALQCoFdXZpF0DUF0kIEu5G2BxethJ+S73JVuMloGctV5BN3mlBxcvKuKp+1yZ97RBcm9lm8g== X-Received: by 10.84.131.111 with SMTP id 102mr4846960pld.178.1507013814418; Mon, 02 Oct 2017 23:56:54 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id s27sm19667356pgo.59.2017.10.02.23.56.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2017 23:56:53 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 03 Oct 2017 17:26:45 +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 v4 5/5] clk: aspeed: Add reset controller Date: Tue, 3 Oct 2017 17:25:40 +1030 Message-Id: <20171003065540.11722-6-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171003065540.11722-1-joel@jms.id.au> References: <20171003065540.11722-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. Signed-off-by: Joel Stanley --- 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 Reviewed-by: Andrew Jeffery diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c index a424b056e767..de491dc7f955 100644 --- a/drivers/clk/clk-aspeed.c +++ b/drivers/clk/clk-aspeed.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -292,6 +293,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, @@ -333,10 +396,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)) { @@ -344,6 +408,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