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