From: Icenowy Zheng <icenowy@aosc.io>
To: Rob Herring <robh+dt@kernel.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Chen-Yu Tsai <wens@csie.org>
Cc: linux-clk@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
Icenowy Zheng <icenowy@aosc.io>
Subject: [PATCH v3 09/11] clk: sunxi-ng: add support for Allwinner A64 DE2 CCU
Date: Fri, 22 Dec 2017 20:22:41 +0800 [thread overview]
Message-ID: <20171222122243.25735-10-icenowy@aosc.io> (raw)
In-Reply-To: <20171222122243.25735-1-icenowy@aosc.io>
Allwinner A64's DE2 needs to claim a section of SRAM (SRAM C) to work.
Add support for it.
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
---
drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 32 ++++++++++++++++++++++++--------
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-de2.c b/drivers/clk/sunxi-ng/ccu-sun8i-de2.c
index 468d1abaf0ee..38b029b7bb5a 100644
--- a/drivers/clk/sunxi-ng/ccu-sun8i-de2.c
+++ b/drivers/clk/sunxi-ng/ccu-sun8i-de2.c
@@ -17,6 +17,7 @@
#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/reset.h>
+#include <linux/soc/sunxi/sunxi_sram.h>
#include "ccu_common.h"
#include "ccu_div.h"
@@ -196,6 +197,11 @@ static const struct sunxi_ccu_desc sun8i_v3s_de2_clk_desc = {
.num_resets = ARRAY_SIZE(sun8i_a83t_de2_resets),
};
+static bool sunxi_de2_clk_has_sram(const struct device_node *node)
+{
+ return of_device_is_compatible(node, "allwinner,sun50i-a64-de2-clk");
+}
+
static int sunxi_de2_clk_probe(struct platform_device *pdev)
{
struct resource *res;
@@ -239,11 +245,20 @@ static int sunxi_de2_clk_probe(struct platform_device *pdev)
return ret;
}
+ if (sunxi_de2_clk_has_sram(pdev->dev.of_node)) {
+ ret = sunxi_sram_claim(&pdev->dev);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "Error couldn't map SRAM to device\n");
+ return ret;
+ }
+ }
+
/* The clocks need to be enabled for us to access the registers */
ret = clk_prepare_enable(bus_clk);
if (ret) {
dev_err(&pdev->dev, "Couldn't enable bus clk: %d\n", ret);
- return ret;
+ goto err_release_sram;
}
ret = clk_prepare_enable(mod_clk);
@@ -272,6 +287,10 @@ static int sunxi_de2_clk_probe(struct platform_device *pdev)
clk_disable_unprepare(mod_clk);
err_disable_bus_clk:
clk_disable_unprepare(bus_clk);
+err_release_sram:
+ if (sunxi_de2_clk_has_sram(pdev->dev.of_node))
+ sunxi_sram_release(&pdev->dev);
+
return ret;
}
@@ -288,17 +307,14 @@ static const struct of_device_id sunxi_de2_clk_ids[] = {
.compatible = "allwinner,sun8i-v3s-de2-clk",
.data = &sun8i_v3s_de2_clk_desc,
},
+ {
+ .compatible = "allwinner,sun50i-a64-de2-clk",
+ .data = &sun50i_a64_de2_clk_desc,
+ },
{
.compatible = "allwinner,sun50i-h5-de2-clk",
.data = &sun50i_a64_de2_clk_desc,
},
- /*
- * The Allwinner A64 SoC needs some bit to be poke in syscon to make
- * DE2 really working.
- * So there's currently no A64 compatible here.
- * H5 shares the same reset line with A64, so here H5 is using the
- * clock description of A64.
- */
{ }
};
--
2.14.2
next prev parent reply other threads:[~2017-12-22 12:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-22 12:22 [PATCH v3 00/11] Allwinner H3/H5/A64(DE2) SimpleFB support Icenowy Zheng
2017-12-22 12:22 ` [PATCH v3 01/11] dt-bindings: fix the binding of Allwinner DE2 CCU of A83T and H3 Icenowy Zheng
2017-12-26 19:00 ` Rob Herring
2017-12-22 12:22 ` [PATCH v3 02/11] clk: sunxi-ng: add support for Allwinner H3 DE2 CCU Icenowy Zheng
2017-12-22 12:22 ` [PATCH v3 03/11] clk: sunxi-ng: fix the A64/H5 clock description of " Icenowy Zheng
2017-12-22 12:22 ` [PATCH v3 04/11] dt-bindings: simplefb-sunxi: add pipelines for DE2 Icenowy Zheng
2017-12-22 12:22 ` [PATCH v3 05/11] ARM: sun8i: h3/h5: add DE2 CCU device node for H3 Icenowy Zheng
2018-01-04 13:39 ` maxime.ripard
2017-12-22 12:22 ` [PATCH v3 06/11] arm64: allwinner: h5: add compatible string for DE2 CCU Icenowy Zheng
2017-12-22 12:22 ` [PATCH v3 07/11] ARM: sunxi: h3/h5: add simplefb nodes Icenowy Zheng
2017-12-29 8:45 ` Chen-Yu Tsai
2017-12-22 12:22 ` [PATCH v3 08/11] dt-bindings: add binding for A64 DE2 CCU SRAM Icenowy Zheng
2017-12-22 12:22 ` Icenowy Zheng [this message]
2017-12-29 8:35 ` [PATCH v3 09/11] clk: sunxi-ng: add support for Allwinner A64 DE2 CCU Chen-Yu Tsai
2018-01-04 13:41 ` Maxime Ripard
2017-12-22 12:22 ` [PATCH v3 10/11] arm64: allwinner: a64: add DE2 CCU for A64 SoC Icenowy Zheng
2017-12-22 12:22 ` [PATCH v3 11/11] arm64: allwinner: a64: add simplefb " Icenowy Zheng
2017-12-27 4:09 ` [PATCH v3 00/11] Allwinner H3/H5/A64(DE2) SimpleFB support Chen-Yu Tsai
2017-12-27 4:10 ` Icenowy Zheng
2017-12-27 4:23 ` Chen-Yu Tsai
2017-12-29 8:52 ` Chen-Yu Tsai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171222122243.25735-10-icenowy@aosc.io \
--to=icenowy@aosc.io \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=robh+dt@kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).