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: 10291813 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 C09D1602BD for ; Mon, 19 Mar 2018 08:12:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B31682910C for ; Mon, 19 Mar 2018 08:12:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A747629155; Mon, 19 Mar 2018 08:12:56 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53AA52910C for ; Mon, 19 Mar 2018 08:12:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755372AbeCSIMj (ORCPT ); Mon, 19 Mar 2018 04:12:39 -0400 Received: from hermes.aosc.io ([199.195.250.187]:36941 "EHLO hermes.aosc.io" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751747AbeCSIMd (ORCPT ); Mon, 19 Mar 2018 04:12:33 -0400 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 Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-sunxi@googlegroups.com, Icenowy Zheng 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> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.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"; }; };