From patchwork Wed Jun 20 05:15:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 10475979 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 CCB6160210 for ; Wed, 20 Jun 2018 05:19:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAB4828D82 for ; Wed, 20 Jun 2018 05:19:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AEFEF28DC2; Wed, 20 Jun 2018 05:19:18 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham 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 4E03228D82 for ; Wed, 20 Jun 2018 05:19: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=/G784Er/nMWkauw8iTBz9VsK8xkpERwblsHtprAIhiE=; b=giU+lyrCOnzvpeBPp0IlC1kbAr 9ns7tJfPvb79XpGJX0dUwzv7uss0Z6tOmwNiu41PEQE1AfwAAkqj13Fzpzj96Ccs1JfBT5jyhcqpM VZ5dc75MAOhXNWpPOFd8fNNa4N9zERE+drbdXl1suc+nhBUH72WTQ7FnP5AXIUZ9wmmTcW3QLHPwk HaclDT9C/a8mdcXSAnjfkGHYQYUpWX9M/IJo5vK5dR00/qoAHHf0wlkMnPRBq/bZbJEEujhz59hQ9 5dESn8ZcWPwIux3+8KCJyWwOOcsfcSQyOlCtQYSJmfYWu0/WPl2gGWZ8J1u6vmaBbTYMvMSOg67Vz CcgNKGbg==; 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 1fVVWR-0001It-Lo; Wed, 20 Jun 2018 05:19:11 +0000 Received: from mirror2.csie.ntu.edu.tw ([140.112.30.76] helo=wens.csie.org) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fVVTU-0008G9-Pg for linux-arm-kernel@lists.infradead.org; Wed, 20 Jun 2018 05:16:12 +0000 Received: by wens.csie.org (Postfix, from userid 1000) id 95AA15FD99; Wed, 20 Jun 2018 13:15:51 +0800 (CST) From: Chen-Yu Tsai To: Maxime Ripard , Lee Jones , Rob Herring , Mark Rutland Subject: [PATCH 4/5] arm64: dts: allwinner: h6: Use macros for R_CCU clock and reset indices Date: Wed, 20 Jun 2018 13:15:39 +0800 Message-Id: <20180620051540.25617-5-wens@csie.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180620051540.25617-1-wens@csie.org> References: <20180620051540.25617-1-wens@csie.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180619_221609_037809_E79910EA X-CRM114-Status: GOOD ( 11.55 ) 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, Andre Przywara , Chen-Yu Tsai , 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 Now that the device tree binding headers for the R_CCU have been merged, we can use the macros, instead of raw numbers. Switch to R_CCU macros for clock and reset indices. Signed-off-by: Chen-Yu Tsai --- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index c72da8cd9ef5..d85070f8c4a2 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -5,7 +5,9 @@ #include #include +#include #include +#include / { interrupt-parent = <&gic>; @@ -198,7 +200,7 @@ reg = <0x07022000 0x400>; interrupts = , ; - clocks = <&r_ccu 2>, <&osc24M>, <&osc32k>; + clocks = <&r_ccu CLK_R_APB1>, <&osc24M>, <&osc32k>; clock-names = "apb", "hosc", "losc"; gpio-controller; #gpio-cells = <3>; @@ -208,6 +210,7 @@ r_i2c_pins: r-i2c { pins = "PL0", "PL1"; function = "s_i2c"; + bias-pull-up; }; }; @@ -215,8 +218,8 @@ compatible = "allwinner,sun6i-a31-i2c"; reg = <0x07081400 0x400>; interrupts = ; - clocks = <&r_ccu 8>; - resets = <&r_ccu 4>; + clocks = <&r_ccu CLK_R_APB2_I2C>; + resets = <&r_ccu RST_R_APB2_I2C>; pinctrl-names = "default"; pinctrl-0 = <&r_i2c_pins>; status = "disabled";