From patchwork Thu Sep 21 04:26:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 9963245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DC6866056A for ; Thu, 21 Sep 2017 04:31:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB31129341 for ; Thu, 21 Sep 2017 04:31:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC36929342; Thu, 21 Sep 2017 04:31:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 31F4129330 for ; Thu, 21 Sep 2017 04:30:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=C+vAlMTRUNm4cVwvA1lg9FfSxzpXDyshU/I15EBOhOY=; b=rpST5uqo6b9hh/B35MoQKeJUEK XkidGZO8shZf+uyMhDB/xOrliJBSRv0lI5Pv7RAytfYj064qjASbcl3alTVG1vZR1nc5WMcy7tfl9 j6hQueCPSgh7ipOvJQGrvPccOtUgDrzwNad9hGpwxgLvCBAzIGakLNEVggK4mLTLKrBSZs9QASPfs f6PMBiWiibWttB6ASYTu8+o9WKqyDHkPFF80SAHgiLWnuyNqu9xQaghMD0TZGNdcSKecKd7Hsizdy 1vihgMekbTaAoVdl+Qf+IDX8grl3Vx1c6qiv/HD24nTXCS/sNUtuNdYYyu46mngyayTu2LZboZOAv y3qQNfPA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dut8Y-000381-9W; Thu, 21 Sep 2017 04:30:54 +0000 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dut5q-0000AI-Q4 for linux-arm-kernel@lists.infradead.org; Thu, 21 Sep 2017 04:28:17 +0000 Received: by mail-pg0-x244.google.com with SMTP id m30so2782775pgn.5 for ; Wed, 20 Sep 2017 21:27:47 -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=b+e7RzS2JHUR1Pqlfo1Armqkyb6M0bgr+J6rJl1yRng=; b=ag8KmszwNGiafFBoi7LWcyblhw0lViod7hXYMeY40mxn7UIlcd3TQk5RLwkMYApuzl iO8m9l/BjrcBpxV83c8w0U4WBugQdOaoB7r3DHvgL24Ggv5OtSyI/oXuczDaEw3ypvE0 J4viI8HHia9p17jnRVdUC6HlJzAQGzayDH/mllMCp2Mpd29ZYge/682hxpC7X/5FSS+7 7qwyBdmza9cBVFuu1HL5wWL1axB14/Onrs3vp7uriSQny7piiyvpdxzpd9KQjmuHJa/l WI1mcJ4TEuPRuIZiTmZuA5liVC9F4r4W2ztU52nml8IpRb7XvTj9Da/uwmXNemJIZt94 A3wQ== 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=b+e7RzS2JHUR1Pqlfo1Armqkyb6M0bgr+J6rJl1yRng=; b=ThXIunZkfvpwLIy0zCyU2iM/HWUyr5WYZT/u64nZ/5hDDQ3nu9RAP8RaLbp+AoGdMF Od9a95MWRiPmYcNEE46K/FE7sFr33f/WwEIinwxZc21XiXDDrTrywqQiH5HW6vYPAxRH 6DDagbsjKlbtRRBRAJHm8qc+Byl35NQ4dFiTFl3QpT4KgtS9eCML7MdVv68+6i7xBcjB 5E8A3wG3uh6atUXD7i9oGU0cs18GUQIBIbRPkI/CapL7I4EwN1r4qpzZE35hk/XrrFFQ PeaZ4TifyPO3LKd4gq745uKKJRN/H8BsG03GsilwNb8vIIwxtsXiIwnmXlehhT4MSF9w sGMQ== X-Gm-Message-State: AHPjjUg08Gb/OeZcyFqyqAT1nPMmqebZaMFB+JQWYnIzbgs8acEEPqyF qbKFvGtTuM+5J+sxtwisaEQ= X-Google-Smtp-Source: AOwi7QB3t5w5Z3U56cLul6J7t2v/DmBvaCPyFy7CHlgCYEqRPWA4+fSzI897XkB8KuMsuu3DCSwoNA== X-Received: by 10.98.32.139 with SMTP id m11mr4423522pfj.172.1505968066868; Wed, 20 Sep 2017 21:27:46 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id 65sm584995pgh.31.2017.09.20.21.27.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Sep 2017 21:27:45 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Thu, 21 Sep 2017 13:57:38 +0930 From: Joel Stanley To: Lee Jones , Michael Turquette , Stephen Boyd Subject: [PATCH v2 5/5] clk: aspeed: Add reset controller Date: Thu, 21 Sep 2017 13:56:41 +0930 Message-Id: <20170921042641.7326-6-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170921042641.7326-1-joel@jms.id.au> References: <20170921042641.7326-1-joel@jms.id.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170920_212807_558774_3311379F X-CRM114-Status: GOOD ( 16.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ryan Chen , Arnd Bergmann , Andrew Jeffery , Benjamin Herrenschmidt , linux-kernel@vger.kernel.org, Rick Altherr , Jeremy Kerr , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP There are some resets that are not associated with gates. These are represented by a reset controller. Signed-off-by: Joel Stanley --- drivers/clk/clk-aspeed.c | 82 +++++++++++++++++++++++++++++++- include/dt-bindings/clock/aspeed-clock.h | 9 ++++ 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c index dec9db4ec47b..db97c0f9f99e 100644 --- a/drivers/clk/clk-aspeed.c +++ b/drivers/clk/clk-aspeed.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -256,6 +257,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[] = { + 25, /* x-dma */ + 24, /* mctp */ + 23, /* adc */ + 22, /* jtag-master */ + 18, /* mic */ + 9, /* pwm */ + 8, /* pci-vga */ + 2, /* i2c */ + 1, /* ahb */ +}; + +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, @@ -299,10 +362,11 @@ static int __init aspeed_clk_probe(struct platform_device *pdev) const struct clk_div_table *mac_div_table; const struct clk_div_table *div_table; 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)) { @@ -310,6 +374,22 @@ static int __init 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(&pdev->dev); div_table = soc_data->div_table; diff --git a/include/dt-bindings/clock/aspeed-clock.h b/include/dt-bindings/clock/aspeed-clock.h index afe06b77562d..a9d552b6bbd2 100644 --- a/include/dt-bindings/clock/aspeed-clock.h +++ b/include/dt-bindings/clock/aspeed-clock.h @@ -40,4 +40,13 @@ #define ASPEED_CLK_GATE_SDCLKCLK (22 + ASPEED_CLK_GATES) #define ASPEED_CLK_GATE_LHCCLK (23 + ASPEED_CLK_GATES) +#define ASPEED_RESET_XDMA 0 +#define ASPEED_RESET_MCTP 1 +#define ASPEED_RESET_JTAG_MASTER 2 +#define ASPEED_RESET_MIC 3 +#define ASPEED_RESET_PWM 4 +#define ASPEED_RESET_PCIVGA 5 +#define ASPEED_RESET_I2C 6 +#define ASPEED_RESET_AHB 7 + #endif