From patchwork Fri Oct 27 15:06:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 10030173 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 E7BA3602D6 for ; Fri, 27 Oct 2017 15:29:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5C1D28DBA for ; Fri, 27 Oct 2017 15:29:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C96C528E96; Fri, 27 Oct 2017 15:29:52 +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 8719428DBA for ; Fri, 27 Oct 2017 15:29:51 +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=5I5PBXH9JfISsvWNW9Frs7NKN9nT+htnFA3sy6zvUoM=; b=hVaNFt6V197mI1IdCAIC4DpRZq 9Lp7iW8Dnm4/ASYAk8/2URRXth/uOyZZ3y5t0npYrgSo93q2YgJxGQ371PBm/6Cqm7fz3EVozfz4T TSjI8PDwc9oJsYczj1g1c1MCZKgW6irwqgcv6TpLgSb5RPwgwwi3b0qJIQMLN/zuDhC+s8EggLqgh sjTpWjBWR8pTcHCdwmYVfan9xZRHyy33/gh9j9q6tSsj6xPGEEVwctSSQi68U5MS64XgbVkdEg/Yt 0I09lBeSKKWS6lb8XjJXpToFR0anIqEUUWxRx31VPH22NuGx8Q7ZfZvxLLl43k+C9FFzhyeuyDi52 N0xKSVsA==; 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 1e86Zt-0003Qd-Bd; Fri, 27 Oct 2017 15:29:45 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e86Nr-0003KF-4J for linux-arm-kernel@bombadil.infradead.org; Fri, 27 Oct 2017 15:17:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=qnjPFGauLRXZqaReGqRd2i1cyllwLHtg8RRog9PPvGc=; b=BiYKPrh81TKWO3PbTTUEghcMM dBniVAF0D8ytEr5z1fulj7uoHgKG9MtcC0vn+PSKPi6i6TuaFYOiWYNMI03Ss6lIFTaRXY260gzVY ULDbAEOOrNhNq+VtrdhT+YwkeTTmOzroyEC2zJ13GYyt57ZZLOBBCC44Adw7aHD57yi1pAGGJbqeu l2XDEw8PMXf8imz18qvRtoVjWDzGr0ngN2lf8yO32pddK3KNz88owwfsMVnE5fR5v2y0PvHYOGM/l VGwQGkfcBACdijlOmvQd9YiUPRMqhXN/sC6G6T7igF8cSx0vHPou/f/5ffUM5ogG7f2p5GPt3NjLM ZWjfYa+TA==; Received: from common.ash.relay.mailchannels.net ([23.83.222.38]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e86Gn-0006N3-Jq for linux-arm-kernel@lists.infradead.org; Fri, 27 Oct 2017 15:10:06 +0000 X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id BD8BC2023E9; Fri, 27 Oct 2017 15:09:34 +0000 (UTC) Received: from hermes.aosc.io (unknown [100.96.143.180]) (Authenticated sender: lmn-TZDUIOWCRQMW) by relay.mailchannels.net (Postfix) with ESMTPA id 00E4720093C; Fri, 27 Oct 2017 15:09:33 +0000 (UTC) X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from hermes.aosc.io (hermes.aosc.io [172.20.67.103]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.9.14); Fri, 27 Oct 2017 15:09:34 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io X-MailChannels-Auth-Id: lmn-TZDUIOWCRQMW X-Belong-Sponge: 04600fff4a08022a_1509116974592_4228951700 X-MC-Loop-Signature: 1509116974592:1514547472 X-MC-Ingress-Time: 1509116974592 Received: from localhost (localhost [127.0.0.1]) (Authenticated sender: icenowy@aosc.io) by hermes.aosc.io (Postfix) with ESMTPSA id 0F8254C20E; Fri, 27 Oct 2017 15:09:27 +0000 (UTC) From: Icenowy Zheng To: Maxime Ripard , Chen-Yu Tsai , Rob Herring 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 Message-Id: <20171027150658.18509-6-icenowy@aosc.io> In-Reply-To: <20171027150658.18509-1-icenowy@aosc.io> References: <20171027150658.18509-1-icenowy@aosc.io> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171027_161003_800116_7CC7EA4A X-CRM114-Status: UNSURE ( 9.20 ) X-CRM114-Notice: Please train this message. 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: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@googlegroups.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Icenowy Zheng 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 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 --- 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 #include #include #include +#include #include #include @@ -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";