From: Icenowy Zheng <icenowy@aosc.io>
To: Maxime Ripard <maxime.ripard@free-electrons.com>,
Chen-Yu Tsai <wens@csie.org>, Rob Herring <robh+dt@kernel.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,
linux-sunxi@googlegroups.com, Icenowy Zheng <icenowy@aosc.io>
Subject: [PATCH v2 05/10] ARM: sun8i: h3/h5: add DE2 CCU device node for H3
Date: Fri, 27 Oct 2017 23:06:53 +0800 [thread overview]
Message-ID: <20171027150658.18509-6-icenowy@aosc.io> (raw)
In-Reply-To: <20171027150658.18509-1-icenowy@aosc.io>
The DE2 in H3/H5 has a clock control unit in it, and the behavior is
slightly different between H3 and H5.
Add the common parts in H3/H5 DTSI, and add the compatible string in H3
DTSI.
The compatible string of H5 DE2 CCU will be added in a separated patch.
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
---
Changes in v2:
- Use H3 DE2 CCU compatible as it's discovered that H3 and A83T DE2 CCU are
not equal.
arch/arm/boot/dts/sun8i-h3.dtsi | 4 ++++
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 14 ++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index b36f9f423c39..8495deecedad 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -85,6 +85,10 @@
compatible = "allwinner,sun8i-h3-ccu";
};
+&display_clocks {
+ compatible = "allwinner,sun8i-h3-de2-clk";
+};
+
&mmc0 {
compatible = "allwinner,sun7i-a20-mmc";
clocks = <&ccu CLK_BUS_MMC0>,
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
index d7a71e726a9f..367319d22116 100644
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
@@ -40,9 +40,11 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <dt-bindings/clock/sun8i-de2.h>
#include <dt-bindings/clock/sun8i-h3-ccu.h>
#include <dt-bindings/clock/sun8i-r-ccu.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/reset/sun8i-de2.h>
#include <dt-bindings/reset/sun8i-h3-ccu.h>
#include <dt-bindings/reset/sun8i-r-ccu.h>
@@ -85,6 +87,18 @@
#size-cells = <1>;
ranges;
+ display_clocks: clock@1000000 {
+ /* compatible is in per SoC .dtsi file */
+ reg = <0x01000000 0x100000>;
+ clocks = <&ccu CLK_DE>,
+ <&ccu CLK_BUS_DE>;
+ clock-names = "mod",
+ "bus";
+ resets = <&ccu RST_BUS_DE>;
+ #clock-cells = <1>;
+ #reset-cells = <1>;
+ };
+
syscon: syscon@1c00000 {
compatible = "allwinner,sun8i-h3-system-controller",
"syscon";
--
2.13.6
next prev parent reply other threads:[~2017-10-27 15:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-27 15:06 [PATCH v2 00/10] Allwinner H3/H5/A64(DE2) SimpleFB support Icenowy Zheng
2017-10-27 15:06 ` [PATCH v2 01/10] dt-bindings: fix the binding of Allwinner DE2 CCU of A83T and H3 Icenowy Zheng
2017-11-01 21:12 ` Rob Herring
2017-10-27 15:06 ` [PATCH v2 02/10] clk: sunxi-ng: add support for Allwinner H3 DE2 CCU Icenowy Zheng
2017-10-27 15:06 ` [PATCH v2 03/10] clk: sunxi-ng: fix the A64/H5 clock description of " Icenowy Zheng
2017-10-27 15:06 ` [PATCH v2 04/10] dt-bindings: simplefb-sunxi: add pipelines for DE2 Icenowy Zheng
2017-10-27 15:06 ` Icenowy Zheng [this message]
2017-10-27 15:06 ` [PATCH v2 06/10] arm64: allwinner: h5: add compatible string for DE2 CCU Icenowy Zheng
2017-10-27 15:06 ` [PATCH v2 07/10] ARM: sunxi: h3/h5: add simplefb nodes Icenowy Zheng
2017-10-27 15:06 ` [PATCH v2 08/10] dt-bindings: add binding for A64 DE2 CCU SRAM Icenowy Zheng
2017-11-01 21:11 ` Rob Herring
2017-10-27 15:06 ` [PATCH v2 09/10] arm64: allwinner: a64: add DE2 CCU for A64 SoC Icenowy Zheng
2017-10-27 15:06 ` [PATCH v2 10/10] arm64: allwinner: a64: add simplefb " Icenowy Zheng
2017-10-30 10:44 ` [PATCH v2 00/10] Allwinner H3/H5/A64(DE2) SimpleFB support icenowy
2017-11-02 8:51 ` Icenowy Zheng
2017-11-02 15:44 ` Maxime Ripard
2017-11-06 8:40 ` Daniel Vetter
[not found] ` <CAP03XerMhdOYL08ED7=rt99BZ=RpXLhz_EySUhrJ4HbjYTX93g@mail.gmail.com>
2017-11-09 12:15 ` [linux-sunxi] " Maxime Ripard
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=20171027150658.18509-6-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=linux-sunxi@googlegroups.com \
--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).