From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFCF5C433DB for ; Mon, 1 Mar 2021 16:24:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C8BC64F35 for ; Mon, 1 Mar 2021 16:24:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C8BC64F35 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=ztiWX9G/MeyMZ7jtpSFh6mVHU60JAVJiLNWic+nynvA=; b=z7M6L+L9fwM0L2dju4g7vV/avo ZR5WKGLvIlHDcmRadp5pmoFJK2Vj4ZiJ2pc7jERccnSzuGPIJQ2SSkivLuXxTpNERcci34mBbCU6r M3Q/zkTkyTz/UA0dKtmDzoJuNE+FxQUoYwVSIXqM2Tj0EY3Ten7rfCkf0W/zMTZ5slW43iS7lLgey qJLx7RmWKPxq4K6U1ip4F2pPtVIyKjyUStES1JUnURIBNym9Cuzs/jVzrKe8kg2nlvenUxqSd2kgm hoUMna5snEwWlnC3Bk2C3GOkRl4Ht0oBgMwIKB/9CElX0JxiOM9fErYwxYP9L8S0nUU1/zXgUw6jj RTAoY4Tg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lGlKJ-0001ym-6n; Mon, 01 Mar 2021 16:23:19 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lGlKG-0001yP-W8 for linux-arm-kernel@lists.infradead.org; Mon, 01 Mar 2021 16:23:17 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 61C5564E62; Mon, 1 Mar 2021 16:23:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614615795; bh=qy4o8aOaG+e/js/CS8OTDNQPLBMrdqSFXahX3iD8ALE=; h=From:To:Cc:Subject:Date:From; b=WXhDQUVw44ZB6VY7h+dbRBbUVliiJxijCsEWdxBY77vV05dEl0CY4nF6LIVZieX+c 9UGl2zRY3GJbRRxZLcT8Ti6gyld1VnA0fM0w/jkes5fG0Ahupu/IKW/bLyVmRNTPty GIw1eGHIYY5bb5kuSYzjVyX9lQCOVZJx+UHSBB6VLxam2R79aQx6ssOPlPK5/ewVKs EzVBg8+VhiNaBmtnEP0vFWntsWXTCMWQ4eVMhb4SOYeoMvOzuVMtfKjhfAdQUTa+gN VaHSLi0cfzMPZj1InGkMbIMHO5pkeiGQbO+P0S+VPsrOEpEG/sdVoTWiPPwu5rMmcR VFX8h+ttClhMw== Received: by wens.tw (Postfix, from userid 1000) id 8634D5FB7F; Tue, 2 Mar 2021 00:23:12 +0800 (CST) From: Chen-Yu Tsai To: Maxime Ripard , Jernej Skrabec Subject: [PATCH] arm64: dts: allwinner: h6: Switch to macros for RSB clock/reset indices Date: Tue, 2 Mar 2021 00:23:09 +0800 Message-Id: <20210301162309.1225-1-wens@kernel.org> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210301_112317_114759_3F15CC1B X-CRM114-Status: GOOD ( 11.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Chen-Yu Tsai , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Chen-Yu Tsai The macros for the clock and reset indices for the RSB hardware block were replaced with raw numbers when the RSB controller node was added. This was done to avoid cross-tree dependencies. Now that both the clk and DT changes have been merged, we can switch back to using the macros. Fixes: aaad900757a6 ("arm64: dts: allwinner: h6: Add RSB controller node") Signed-off-by: Chen-Yu Tsai --- Small patch split out from the H6 RSB clock support patch. This should be merged for v5.12. --- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index 49e979794094..af8b7d0ef750 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -995,9 +995,9 @@ r_rsb: rsb@7083000 { compatible = "allwinner,sun8i-a23-rsb"; reg = <0x07083000 0x400>; interrupts = ; - clocks = <&r_ccu 13>; + clocks = <&r_ccu CLK_R_APB2_RSB>; clock-frequency = <3000000>; - resets = <&r_ccu 7>; + resets = <&r_ccu RST_R_APB2_RSB>; pinctrl-names = "default"; pinctrl-0 = <&r_rsb_pins>; status = "disabled"; -- 2.30.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel