From patchwork Mon Mar 19 08:11:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 10291815 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 9D219602BD for ; Mon, 19 Mar 2018 08:13:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D6F0291A4 for ; Mon, 19 Mar 2018 08:13:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 821A1291A9; Mon, 19 Mar 2018 08:13:19 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 E5C62291A4 for ; Mon, 19 Mar 2018 08:13:18 +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=UK4WzIENqDnsTJabpPpYJv3nOlNTaPixfZRr5jkW074=; b=XJxiNwr8UMePQH9hRNfDxoW3NK X05Hz5mPW+aP9/Frmr0UK6uQD6k3ov5acav1vJmI/YOEaTmscNQef/ERU/UNYP9fOQccGkI/hmpsF CJSFdKL057u/0hlj6nNJ/5/eZPv4QcOdt3H07CvxbDmZ0eD2U0MHJc99cBPApugPg4mVoNuTirsRA qSk5iGeIDC32lDybaGIwA48SSdfOU4kZF4kX+R75rNgdvyIhct3DQBS+xLcj2rIvdSde20M+UI8RQ yzYexFT3BD6b+9ZWdPC2wwAvb5Dq46J98tl5C92g8ZtAJn8YoxZsLLkI4p2BD1DL6/R3qG+zFSykR ry0l4ZFg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1expuq-0006qP-0R; Mon, 19 Mar 2018 08:13:12 +0000 Received: from black.maple.relay.mailchannels.net ([23.83.214.19]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1expuP-0006W2-WD for linux-arm-kernel@lists.infradead.org; Mon, 19 Mar 2018 08:12:51 +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 DA845402BC; Mon, 19 Mar 2018 08:12:34 +0000 (UTC) Received: from hermes.aosc.io (unknown [100.96.15.14]) (Authenticated sender: lmn-TZDUIOWCRQMW) by relay.mailchannels.net (Postfix) with ESMTPA id 4B747411C7; Mon, 19 Mar 2018 08:12:34 +0000 (UTC) X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from hermes.aosc.io (hermes.aosc.io [100.96.15.1]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.14.1); Mon, 19 Mar 2018 08:12:34 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io X-MailChannels-Auth-Id: lmn-TZDUIOWCRQMW X-Blushing-Thoughtful: 7505698a7a337965_1521447154766_431132391 X-MC-Loop-Signature: 1521447154766:2656787313 X-MC-Ingress-Time: 1521447154765 Received: from localhost (localhost [127.0.0.1]) (Authenticated sender: icenowy@aosc.io) by hermes.aosc.io (Postfix) with ESMTPSA id 1996459A7D; Mon, 19 Mar 2018 08:12:29 +0000 (UTC) From: Icenowy Zheng To: Maxime Ripard , Chen-Yu Tsai Subject: [PATCH 2/2] arm64: allwinner: h6: temporarily drop the usage of CCU headers in DTSI Date: Mon, 19 Mar 2018 16:11:08 +0800 Message-Id: <20180319081108.23496-2-icenowy@aosc.io> In-Reply-To: <20180319081108.23496-1-icenowy@aosc.io> References: <20180319081108.23496-1-icenowy@aosc.io> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180319_011246_476608_463722CE X-CRM114-Status: GOOD ( 14.92 ) 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, 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 As the CCU driver will be merged in different tree with the device tree, temporarily drop the usage of CCU headers in the DTSI file, and replace macros with the corresponding numbers. After they are both merged into Linus' tree, it can be switched back to use the CCU headers. Signed-off-by: Icenowy Zheng --- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index 4debc3962830..56563150d61a 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -4,8 +4,6 @@ */ #include -#include -#include / { interrupt-parent = <&gic>; @@ -117,7 +115,7 @@ , , ; - clocks = <&ccu CLK_APB1>, <&osc24M>, <&osc32k>; + clocks = <&ccu 26>, <&osc24M>, <&osc32k>; clock-names = "apb", "hosc", "losc"; gpio-controller; #gpio-cells = <3>; @@ -136,8 +134,8 @@ interrupts = ; reg-shift = <2>; reg-io-width = <4>; - clocks = <&ccu CLK_BUS_UART0>; - resets = <&ccu RST_BUS_UART0>; + clocks = <&ccu 70>; + resets = <&ccu 21>; status = "disabled"; }; @@ -147,8 +145,8 @@ interrupts = ; reg-shift = <2>; reg-io-width = <4>; - clocks = <&ccu CLK_BUS_UART1>; - resets = <&ccu RST_BUS_UART1>; + clocks = <&ccu 71>; + resets = <&ccu 22>; status = "disabled"; }; @@ -158,8 +156,8 @@ interrupts = ; reg-shift = <2>; reg-io-width = <4>; - clocks = <&ccu CLK_BUS_UART2>; - resets = <&ccu RST_BUS_UART2>; + clocks = <&ccu 72>; + resets = <&ccu 23>; status = "disabled"; }; @@ -169,8 +167,8 @@ interrupts = ; reg-shift = <2>; reg-io-width = <4>; - clocks = <&ccu CLK_BUS_UART3>; - resets = <&ccu RST_BUS_UART3>; + clocks = <&ccu 73>; + resets = <&ccu 24>; status = "disabled"; }; };