From patchwork Fri Jan 27 13:39:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 647733 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E44DFC61DA3 for ; Fri, 27 Jan 2023 13:39:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229714AbjA0Njp (ORCPT ); Fri, 27 Jan 2023 08:39:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231305AbjA0Njp (ORCPT ); Fri, 27 Jan 2023 08:39:45 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D84077EFD7; Fri, 27 Jan 2023 05:39:41 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id fl11-20020a05600c0b8b00b003daf72fc844so5448920wmb.0; Fri, 27 Jan 2023 05:39:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GkuUfx6E0d5Plx+PFPiy4Cp6/WnNYD6MFBradHYfLZg=; b=QCn/P/jem5iMotAW+dKTl0LYab58p7APkNw6gE0Nv7qz+ML8nTvlifLSlUv/27oeSe WuKQTROKi1vK9NUnog1lOdUC0AJ58swKzfINtGZt9SkOcbx9W80BK6eHt6Tw2ajBCTey EQ042db3CD38/RU93YGnB7mooN+MuGeHt0b87ZpGKhew+gea6BwrQOKMStqKlI9g+OgF LxiggfOy+EMab1ifBeYr5Hq8tTdvgBHD3Yow7BvX7BY0+x3vVxR+p99Vg1zcgQK7kWVq fsvvkyvwd8ZivrPmg78Jw4c3QCX9pFMRwEunPzmazbwp67isolZRBU8tcN9z6Z+mI8SI RVSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GkuUfx6E0d5Plx+PFPiy4Cp6/WnNYD6MFBradHYfLZg=; b=793fTYh4hACWWSbKOuL/QaoNOkfyT0Mz6kVG3iRMuDYskEjQTv/+5GjZNcBEb2RGNd b5DCY1Uy8aLOMKZNbNb5T3Q7U7ghwQMqKXQkx8BF7ku0emEqsQNrsJv40dY58Y4jRrr3 1UEuR/x6l2RiwHpqN7Y0xlYhauQmPooivsHkMgshYhoNgxT+FlMI9Nsr/07mwTinESjI fDGMY+9gOdxja5VPhlcBpF6HksmZQyaoNPZi9D1nUsfolDCxQyuR5spp42Wg79R64xLb 3QzRDG/hJgfuiY4JoVeEAP2y9M//6/K/GOv0z73vcF260d57aqCAfIlA93S7m7RMbXid KtTA== X-Gm-Message-State: AFqh2kqRq57h3H3nME6cplykWLUub/B9AyZBVzurtoRfAuqEbxgC3Eim mmEH9il2t6qonCTZ6DoK8uo= X-Google-Smtp-Source: AMrXdXuEZaGnJPR7uTYahOsh+YusOKY7gIQNNbwFwNZc9lRxKxY0jMX/9dg47pGHBVlIPGV93vvaEw== X-Received: by 2002:a05:600c:3c86:b0:3da:2a59:8a4f with SMTP id bg6-20020a05600c3c8600b003da2a598a4fmr40195084wmb.38.1674826780193; Fri, 27 Jan 2023 05:39:40 -0800 (PST) Received: from prasmi.home ([2a00:23c8:2501:c701:ca6:cb06:c6e7:59f6]) by smtp.gmail.com with ESMTPSA id p12-20020a05600c468c00b003dc22ee5a2bsm5752918wmo.39.2023.01.27.05.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 05:39:39 -0800 (PST) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Magnus Damm Cc: Rob Herring , Krzysztof Kozlowski , linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar , Biju Das , Lad Prabhakar Subject: [PATCH 1/2] arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and RESET Date: Fri, 27 Jan 2023 13:39:08 +0000 Message-Id: <20230127133909.144774-2-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127133909.144774-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20230127133909.144774-1-prabhakar.mahadev-lad.rj@bp.renesas.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Lad Prabhakar Use a SoC specific macro for CPG and RESET so that we can re-use the RZ/G2L SoC DTSI for RZ/V2L SoC by just updating the SoC specific macro. Signed-off-by: Lad Prabhakar --- arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 254 +++++++++++---------- 1 file changed, 129 insertions(+), 125 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r9a07g044.dtsi b/arch/arm64/boot/dts/renesas/r9a07g044.dtsi index 487536696d90..80b2332798d9 100644 --- a/arch/arm64/boot/dts/renesas/r9a07g044.dtsi +++ b/arch/arm64/boot/dts/renesas/r9a07g044.dtsi @@ -1,12 +1,16 @@ // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) /* - * Device Tree Source for the RZ/G2L and RZ/G2LC common SoC parts + * Device Tree Source for the RZ/G2L, RZ/G2LC and RZ/V2L common SoC parts * * Copyright (C) 2021 Renesas Electronics Corp. */ #include + +#ifndef SOC_CPG_PREFIX #include +#define SOC_CPG_PREFIX(X) R9A07G044_ ## X +#endif / { compatible = "renesas,r9a07g044"; @@ -91,7 +95,7 @@ cpu0: cpu@0 { #cooling-cells = <2>; next-level-cache = <&L3_CA55>; enable-method = "psci"; - clocks = <&cpg CPG_CORE R9A07G044_CLK_I>; + clocks = <&cpg CPG_CORE SOC_CPG_PREFIX(CLK_I)>; operating-points-v2 = <&cluster0_opp>; }; @@ -101,7 +105,7 @@ cpu1: cpu@100 { device_type = "cpu"; next-level-cache = <&L3_CA55>; enable-method = "psci"; - clocks = <&cpg CPG_CORE R9A07G044_CLK_I>; + clocks = <&cpg CPG_CORE SOC_CPG_PREFIX(CLK_I)>; operating-points-v2 = <&cluster0_opp>; }; @@ -178,11 +182,11 @@ ssi0: ssi@10049c00 { , ; interrupt-names = "int_req", "dma_rx", "dma_tx", "dma_rt"; - clocks = <&cpg CPG_MOD R9A07G044_SSI0_PCLK2>, - <&cpg CPG_MOD R9A07G044_SSI0_PCLK_SFR>, + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SSI0_PCLK2)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(SSI0_PCLK_SFR)>, <&audio_clk1>, <&audio_clk2>; clock-names = "ssi", "ssi_sfr", "audio_clk1", "audio_clk2"; - resets = <&cpg R9A07G044_SSI0_RST_M2_REG>; + resets = <&cpg SOC_CPG_PREFIX(SSI0_RST_M2_REG)>; dmas = <&dmac 0x2655>, <&dmac 0x2656>; dma-names = "tx", "rx"; power-domains = <&cpg>; @@ -199,11 +203,11 @@ ssi1: ssi@1004a000 { , ; interrupt-names = "int_req", "dma_rx", "dma_tx", "dma_rt"; - clocks = <&cpg CPG_MOD R9A07G044_SSI1_PCLK2>, - <&cpg CPG_MOD R9A07G044_SSI1_PCLK_SFR>, + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SSI1_PCLK2)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(SSI1_PCLK_SFR)>, <&audio_clk1>, <&audio_clk2>; clock-names = "ssi", "ssi_sfr", "audio_clk1", "audio_clk2"; - resets = <&cpg R9A07G044_SSI1_RST_M2_REG>; + resets = <&cpg SOC_CPG_PREFIX(SSI1_RST_M2_REG)>; dmas = <&dmac 0x2659>, <&dmac 0x265a>; dma-names = "tx", "rx"; power-domains = <&cpg>; @@ -220,11 +224,11 @@ ssi2: ssi@1004a400 { , ; interrupt-names = "int_req", "dma_rx", "dma_tx", "dma_rt"; - clocks = <&cpg CPG_MOD R9A07G044_SSI2_PCLK2>, - <&cpg CPG_MOD R9A07G044_SSI2_PCLK_SFR>, + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SSI2_PCLK2)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(SSI2_PCLK_SFR)>, <&audio_clk1>, <&audio_clk2>; clock-names = "ssi", "ssi_sfr", "audio_clk1", "audio_clk2"; - resets = <&cpg R9A07G044_SSI2_RST_M2_REG>; + resets = <&cpg SOC_CPG_PREFIX(SSI2_RST_M2_REG)>; dmas = <&dmac 0x265f>; dma-names = "rt"; power-domains = <&cpg>; @@ -241,11 +245,11 @@ ssi3: ssi@1004a800 { , ; interrupt-names = "int_req", "dma_rx", "dma_tx", "dma_rt"; - clocks = <&cpg CPG_MOD R9A07G044_SSI3_PCLK2>, - <&cpg CPG_MOD R9A07G044_SSI3_PCLK_SFR>, + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SSI3_PCLK2)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(SSI3_PCLK_SFR)>, <&audio_clk1>, <&audio_clk2>; clock-names = "ssi", "ssi_sfr", "audio_clk1", "audio_clk2"; - resets = <&cpg R9A07G044_SSI3_RST_M2_REG>; + resets = <&cpg SOC_CPG_PREFIX(SSI3_RST_M2_REG)>; dmas = <&dmac 0x2661>, <&dmac 0x2662>; dma-names = "tx", "rx"; power-domains = <&cpg>; @@ -260,8 +264,8 @@ spi0: spi@1004ac00 { , ; interrupt-names = "error", "rx", "tx"; - clocks = <&cpg CPG_MOD R9A07G044_RSPI0_CLKB>; - resets = <&cpg R9A07G044_RSPI0_RST>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(RSPI0_CLKB)>; + resets = <&cpg SOC_CPG_PREFIX(RSPI0_RST)>; dmas = <&dmac 0x2e95>, <&dmac 0x2e96>; dma-names = "tx", "rx"; power-domains = <&cpg>; @@ -278,8 +282,8 @@ spi1: spi@1004b000 { , ; interrupt-names = "error", "rx", "tx"; - clocks = <&cpg CPG_MOD R9A07G044_RSPI1_CLKB>; - resets = <&cpg R9A07G044_RSPI1_RST>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(RSPI1_CLKB)>; + resets = <&cpg SOC_CPG_PREFIX(RSPI1_RST)>; dmas = <&dmac 0x2e99>, <&dmac 0x2e9a>; dma-names = "tx", "rx"; power-domains = <&cpg>; @@ -296,8 +300,8 @@ spi2: spi@1004b400 { , ; interrupt-names = "error", "rx", "tx"; - clocks = <&cpg CPG_MOD R9A07G044_RSPI2_CLKB>; - resets = <&cpg R9A07G044_RSPI2_RST>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(RSPI2_CLKB)>; + resets = <&cpg SOC_CPG_PREFIX(RSPI2_RST)>; dmas = <&dmac 0x2e9d>, <&dmac 0x2e9e>; dma-names = "tx", "rx"; power-domains = <&cpg>; @@ -318,10 +322,10 @@ scif0: serial@1004b800 { ; interrupt-names = "eri", "rxi", "txi", "bri", "dri", "tei"; - clocks = <&cpg CPG_MOD R9A07G044_SCIF0_CLK_PCK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCIF0_CLK_PCK)>; clock-names = "fck"; power-domains = <&cpg>; - resets = <&cpg R9A07G044_SCIF0_RST_SYSTEM_N>; + resets = <&cpg SOC_CPG_PREFIX(SCIF0_RST_SYSTEM_N)>; status = "disabled"; }; @@ -336,10 +340,10 @@ scif1: serial@1004bc00 { ; interrupt-names = "eri", "rxi", "txi", "bri", "dri", "tei"; - clocks = <&cpg CPG_MOD R9A07G044_SCIF1_CLK_PCK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCIF1_CLK_PCK)>; clock-names = "fck"; power-domains = <&cpg>; - resets = <&cpg R9A07G044_SCIF1_RST_SYSTEM_N>; + resets = <&cpg SOC_CPG_PREFIX(SCIF1_RST_SYSTEM_N)>; status = "disabled"; }; @@ -354,10 +358,10 @@ scif2: serial@1004c000 { ; interrupt-names = "eri", "rxi", "txi", "bri", "dri", "tei"; - clocks = <&cpg CPG_MOD R9A07G044_SCIF2_CLK_PCK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCIF2_CLK_PCK)>; clock-names = "fck"; power-domains = <&cpg>; - resets = <&cpg R9A07G044_SCIF2_RST_SYSTEM_N>; + resets = <&cpg SOC_CPG_PREFIX(SCIF2_RST_SYSTEM_N)>; status = "disabled"; }; @@ -372,10 +376,10 @@ scif3: serial@1004c400 { ; interrupt-names = "eri", "rxi", "txi", "bri", "dri", "tei"; - clocks = <&cpg CPG_MOD R9A07G044_SCIF3_CLK_PCK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCIF3_CLK_PCK)>; clock-names = "fck"; power-domains = <&cpg>; - resets = <&cpg R9A07G044_SCIF3_RST_SYSTEM_N>; + resets = <&cpg SOC_CPG_PREFIX(SCIF3_RST_SYSTEM_N)>; status = "disabled"; }; @@ -390,10 +394,10 @@ scif4: serial@1004c800 { ; interrupt-names = "eri", "rxi", "txi", "bri", "dri", "tei"; - clocks = <&cpg CPG_MOD R9A07G044_SCIF4_CLK_PCK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCIF4_CLK_PCK)>; clock-names = "fck"; power-domains = <&cpg>; - resets = <&cpg R9A07G044_SCIF4_RST_SYSTEM_N>; + resets = <&cpg SOC_CPG_PREFIX(SCIF4_RST_SYSTEM_N)>; status = "disabled"; }; @@ -405,10 +409,10 @@ sci0: serial@1004d000 { , ; interrupt-names = "eri", "rxi", "txi", "tei"; - clocks = <&cpg CPG_MOD R9A07G044_SCI0_CLKP>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCI0_CLKP)>; clock-names = "fck"; power-domains = <&cpg>; - resets = <&cpg R9A07G044_SCI0_RST>; + resets = <&cpg SOC_CPG_PREFIX(SCI0_RST)>; status = "disabled"; }; @@ -420,10 +424,10 @@ sci1: serial@1004d400 { , ; interrupt-names = "eri", "rxi", "txi", "tei"; - clocks = <&cpg CPG_MOD R9A07G044_SCI1_CLKP>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCI1_CLKP)>; clock-names = "fck"; power-domains = <&cpg>; - resets = <&cpg R9A07G044_SCI1_RST>; + resets = <&cpg SOC_CPG_PREFIX(SCI1_RST)>; status = "disabled"; }; @@ -441,14 +445,14 @@ canfd: can@10050000 { interrupt-names = "g_err", "g_recc", "ch0_err", "ch0_rec", "ch0_trx", "ch1_err", "ch1_rec", "ch1_trx"; - clocks = <&cpg CPG_MOD R9A07G044_CANFD_PCLK>, - <&cpg CPG_CORE R9A07G044_CLK_P0_DIV2>, + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(CANFD_PCLK)>, + <&cpg CPG_CORE SOC_CPG_PREFIX(CLK_P0_DIV2)>, <&can_clk>; clock-names = "fck", "canfd", "can_clk"; - assigned-clocks = <&cpg CPG_CORE R9A07G044_CLK_P0_DIV2>; + assigned-clocks = <&cpg CPG_CORE SOC_CPG_PREFIX(CLK_P0_DIV2)>; assigned-clock-rates = <50000000>; - resets = <&cpg R9A07G044_CANFD_RSTP_N>, - <&cpg R9A07G044_CANFD_RSTC_N>; + resets = <&cpg SOC_CPG_PREFIX(CANFD_RSTP_N)>, + <&cpg SOC_CPG_PREFIX(CANFD_RSTC_N)>; reset-names = "rstp_n", "rstc_n"; power-domains = <&cpg>; status = "disabled"; @@ -476,9 +480,9 @@ i2c0: i2c@10058000 { ; interrupt-names = "tei", "ri", "ti", "spi", "sti", "naki", "ali", "tmoi"; - clocks = <&cpg CPG_MOD R9A07G044_I2C0_PCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(I2C0_PCLK)>; clock-frequency = <100000>; - resets = <&cpg R9A07G044_I2C0_MRST>; + resets = <&cpg SOC_CPG_PREFIX(I2C0_MRST)>; power-domains = <&cpg>; status = "disabled"; }; @@ -498,9 +502,9 @@ i2c1: i2c@10058400 { ; interrupt-names = "tei", "ri", "ti", "spi", "sti", "naki", "ali", "tmoi"; - clocks = <&cpg CPG_MOD R9A07G044_I2C1_PCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(I2C1_PCLK)>; clock-frequency = <100000>; - resets = <&cpg R9A07G044_I2C1_MRST>; + resets = <&cpg SOC_CPG_PREFIX(I2C1_MRST)>; power-domains = <&cpg>; status = "disabled"; }; @@ -520,9 +524,9 @@ i2c2: i2c@10058800 { ; interrupt-names = "tei", "ri", "ti", "spi", "sti", "naki", "ali", "tmoi"; - clocks = <&cpg CPG_MOD R9A07G044_I2C2_PCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(I2C2_PCLK)>; clock-frequency = <100000>; - resets = <&cpg R9A07G044_I2C2_MRST>; + resets = <&cpg SOC_CPG_PREFIX(I2C2_MRST)>; power-domains = <&cpg>; status = "disabled"; }; @@ -542,9 +546,9 @@ i2c3: i2c@10058c00 { ; interrupt-names = "tei", "ri", "ti", "spi", "sti", "naki", "ali", "tmoi"; - clocks = <&cpg CPG_MOD R9A07G044_I2C3_PCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(I2C3_PCLK)>; clock-frequency = <100000>; - resets = <&cpg R9A07G044_I2C3_MRST>; + resets = <&cpg SOC_CPG_PREFIX(I2C3_MRST)>; power-domains = <&cpg>; status = "disabled"; }; @@ -553,11 +557,11 @@ adc: adc@10059000 { compatible = "renesas,r9a07g044-adc", "renesas,rzg2l-adc"; reg = <0 0x10059000 0 0x400>; interrupts = ; - clocks = <&cpg CPG_MOD R9A07G044_ADC_ADCLK>, - <&cpg CPG_MOD R9A07G044_ADC_PCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(ADC_ADCLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(ADC_PCLK)>; clock-names = "adclk", "pclk"; - resets = <&cpg R9A07G044_ADC_PRESETN>, - <&cpg R9A07G044_ADC_ADRST_N>; + resets = <&cpg SOC_CPG_PREFIX(ADC_PRESETN)>, + <&cpg SOC_CPG_PREFIX(ADC_ADRST_N)>; reset-names = "presetn", "adrst-n"; power-domains = <&cpg>; status = "disabled"; @@ -595,8 +599,8 @@ tsu: thermal@10059400 { compatible = "renesas,r9a07g044-tsu", "renesas,rzg2l-tsu"; reg = <0 0x10059400 0 0x400>; - clocks = <&cpg CPG_MOD R9A07G044_TSU_PCLK>; - resets = <&cpg R9A07G044_TSU_PRESETN>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(TSU_PCLK)>; + resets = <&cpg SOC_CPG_PREFIX(TSU_PRESETN)>; power-domains = <&cpg>; #thermal-sensor-cells = <1>; }; @@ -609,9 +613,9 @@ sbc: spi@10060000 { <0 0x10070000 0 0x10000>; reg-names = "regs", "dirmap", "wbuf"; interrupts = ; - clocks = <&cpg CPG_MOD R9A07G044_SPI_CLK2>, - <&cpg CPG_MOD R9A07G044_SPI_CLK>; - resets = <&cpg R9A07G044_SPI_RST>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SPI_CLK2)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(SPI_CLK)>; + resets = <&cpg SOC_CPG_PREFIX(SPI_RST)>; power-domains = <&cpg>; #address-cells = <1>; #size-cells = <0>; @@ -649,11 +653,11 @@ pinctrl: pinctrl@11030000 { interrupt-parent = <&irqc>; interrupt-controller; gpio-ranges = <&pinctrl 0 0 392>; - clocks = <&cpg CPG_MOD R9A07G044_GPIO_HCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(GPIO_HCLK)>; power-domains = <&cpg>; - resets = <&cpg R9A07G044_GPIO_RSTN>, - <&cpg R9A07G044_GPIO_PORT_RESETN>, - <&cpg R9A07G044_GPIO_SPARE_RESETN>; + resets = <&cpg SOC_CPG_PREFIX(GPIO_RSTN)>, + <&cpg SOC_CPG_PREFIX(GPIO_PORT_RESETN)>, + <&cpg SOC_CPG_PREFIX(GPIO_SPARE_RESETN)>; }; irqc: interrupt-controller@110a0000 { @@ -704,11 +708,11 @@ irqc: interrupt-controller@110a0000 { , , ; - clocks = <&cpg CPG_MOD R9A07G044_IA55_CLK>, - <&cpg CPG_MOD R9A07G044_IA55_PCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(IA55_CLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(IA55_PCLK)>; clock-names = "clk", "pclk"; power-domains = <&cpg>; - resets = <&cpg R9A07G044_IA55_RESETN>; + resets = <&cpg SOC_CPG_PREFIX(IA55_RESETN)>; }; dmac: dma-controller@11820000 { @@ -738,11 +742,11 @@ dmac: dma-controller@11820000 { "ch4", "ch5", "ch6", "ch7", "ch8", "ch9", "ch10", "ch11", "ch12", "ch13", "ch14", "ch15"; - clocks = <&cpg CPG_MOD R9A07G044_DMAC_ACLK>, - <&cpg CPG_MOD R9A07G044_DMAC_PCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(DMAC_ACLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(DMAC_PCLK)>; power-domains = <&cpg>; - resets = <&cpg R9A07G044_DMAC_ARESETN>, - <&cpg R9A07G044_DMAC_RST_ASYNC>; + resets = <&cpg SOC_CPG_PREFIX(DMAC_ARESETN)>, + <&cpg SOC_CPG_PREFIX(DMAC_RST_ASYNC)>; #dma-cells = <1>; dma-channels = <16>; }; @@ -756,14 +760,14 @@ gpu: gpu@11840000 { , ; interrupt-names = "job", "mmu", "gpu", "event"; - clocks = <&cpg CPG_MOD R9A07G044_GPU_CLK>, - <&cpg CPG_MOD R9A07G044_GPU_AXI_CLK>, - <&cpg CPG_MOD R9A07G044_GPU_ACE_CLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(GPU_CLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(GPU_AXI_CLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(GPU_ACE_CLK)>; clock-names = "gpu", "bus", "bus_ace"; power-domains = <&cpg>; - resets = <&cpg R9A07G044_GPU_RESETN>, - <&cpg R9A07G044_GPU_AXI_RESETN>, - <&cpg R9A07G044_GPU_ACE_RESETN>; + resets = <&cpg SOC_CPG_PREFIX(GPU_RESETN)>, + <&cpg SOC_CPG_PREFIX(GPU_AXI_RESETN)>, + <&cpg SOC_CPG_PREFIX(GPU_ACE_RESETN)>; reset-names = "rst", "axi_rst", "ace_rst"; operating-points-v2 = <&gpu_opp_table>; }; @@ -784,12 +788,12 @@ sdhi0: mmc@11c00000 { reg = <0x0 0x11c00000 0 0x10000>; interrupts = , ; - clocks = <&cpg CPG_MOD R9A07G044_SDHI0_IMCLK>, - <&cpg CPG_MOD R9A07G044_SDHI0_CLK_HS>, - <&cpg CPG_MOD R9A07G044_SDHI0_IMCLK2>, - <&cpg CPG_MOD R9A07G044_SDHI0_ACLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI0_IMCLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI0_CLK_HS)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI0_IMCLK2)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI0_ACLK)>; clock-names = "core", "clkh", "cd", "aclk"; - resets = <&cpg R9A07G044_SDHI0_IXRST>; + resets = <&cpg SOC_CPG_PREFIX(SDHI0_IXRST)>; power-domains = <&cpg>; status = "disabled"; }; @@ -800,12 +804,12 @@ sdhi1: mmc@11c10000 { reg = <0x0 0x11c10000 0 0x10000>; interrupts = , ; - clocks = <&cpg CPG_MOD R9A07G044_SDHI1_IMCLK>, - <&cpg CPG_MOD R9A07G044_SDHI1_CLK_HS>, - <&cpg CPG_MOD R9A07G044_SDHI1_IMCLK2>, - <&cpg CPG_MOD R9A07G044_SDHI1_ACLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI1_IMCLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI1_CLK_HS)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI1_IMCLK2)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI1_ACLK)>; clock-names = "core", "clkh", "cd", "aclk"; - resets = <&cpg R9A07G044_SDHI1_IXRST>; + resets = <&cpg SOC_CPG_PREFIX(SDHI1_IXRST)>; power-domains = <&cpg>; status = "disabled"; }; @@ -819,11 +823,11 @@ eth0: ethernet@11c20000 { ; interrupt-names = "mux", "fil", "arp_ns"; phy-mode = "rgmii"; - clocks = <&cpg CPG_MOD R9A07G044_ETH0_CLK_AXI>, - <&cpg CPG_MOD R9A07G044_ETH0_CLK_CHI>, - <&cpg CPG_CORE R9A07G044_CLK_HP>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(ETH0_CLK_AXI)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(ETH0_CLK_CHI)>, + <&cpg CPG_CORE SOC_CPG_PREFIX(CLK_HP>); clock-names = "axi", "chi", "refclk"; - resets = <&cpg R9A07G044_ETH0_RST_HW_N>; + resets = <&cpg SOC_CPG_PREFIX(ETH0_RST_HW_N)>; power-domains = <&cpg>; #address-cells = <1>; #size-cells = <0>; @@ -839,11 +843,11 @@ eth1: ethernet@11c30000 { ; interrupt-names = "mux", "fil", "arp_ns"; phy-mode = "rgmii"; - clocks = <&cpg CPG_MOD R9A07G044_ETH1_CLK_AXI>, - <&cpg CPG_MOD R9A07G044_ETH1_CLK_CHI>, - <&cpg CPG_CORE R9A07G044_CLK_HP>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(ETH1_CLK_AXI)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(ETH1_CLK_CHI)>, + <&cpg CPG_CORE SOC_CPG_PREFIX(CLK_HP)>; clock-names = "axi", "chi", "refclk"; - resets = <&cpg R9A07G044_ETH1_RST_HW_N>; + resets = <&cpg SOC_CPG_PREFIX(ETH1_RST_HW_N)>; power-domains = <&cpg>; #address-cells = <1>; #size-cells = <0>; @@ -854,8 +858,8 @@ phyrst: usbphy-ctrl@11c40000 { compatible = "renesas,r9a07g044-usbphy-ctrl", "renesas,rzg2l-usbphy-ctrl"; reg = <0 0x11c40000 0 0x10000>; - clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>; - resets = <&cpg R9A07G044_USB_PRESETN>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>; + resets = <&cpg SOC_CPG_PREFIX(USB_PRESETN)>; power-domains = <&cpg>; #reset-cells = <1>; status = "disabled"; @@ -865,10 +869,10 @@ ohci0: usb@11c50000 { compatible = "generic-ohci"; reg = <0 0x11c50000 0 0x100>; interrupts = ; - clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>, - <&cpg CPG_MOD R9A07G044_USB_U2H0_HCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2H0_HCLK)>; resets = <&phyrst 0>, - <&cpg R9A07G044_USB_U2H0_HRESETN>; + <&cpg SOC_CPG_PREFIX(USB_U2H0_HRESETN)>; phys = <&usb2_phy0 1>; phy-names = "usb"; power-domains = <&cpg>; @@ -879,10 +883,10 @@ ohci1: usb@11c70000 { compatible = "generic-ohci"; reg = <0 0x11c70000 0 0x100>; interrupts = ; - clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>, - <&cpg CPG_MOD R9A07G044_USB_U2H1_HCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2H1_HCLK)>; resets = <&phyrst 1>, - <&cpg R9A07G044_USB_U2H1_HRESETN>; + <&cpg SOC_CPG_PREFIX(USB_U2H1_HRESETN)>; phys = <&usb2_phy1 1>; phy-names = "usb"; power-domains = <&cpg>; @@ -893,10 +897,10 @@ ehci0: usb@11c50100 { compatible = "generic-ehci"; reg = <0 0x11c50100 0 0x100>; interrupts = ; - clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>, - <&cpg CPG_MOD R9A07G044_USB_U2H0_HCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2H0_HCLK)>; resets = <&phyrst 0>, - <&cpg R9A07G044_USB_U2H0_HRESETN>; + <&cpg SOC_CPG_PREFIX(USB_U2H0_HRESETN)>; phys = <&usb2_phy0 2>; phy-names = "usb"; companion = <&ohci0>; @@ -908,10 +912,10 @@ ehci1: usb@11c70100 { compatible = "generic-ehci"; reg = <0 0x11c70100 0 0x100>; interrupts = ; - clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>, - <&cpg CPG_MOD R9A07G044_USB_U2H1_HCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2H1_HCLK)>; resets = <&phyrst 1>, - <&cpg R9A07G044_USB_U2H1_HRESETN>; + <&cpg SOC_CPG_PREFIX(USB_U2H1_HRESETN)>; phys = <&usb2_phy1 2>; phy-names = "usb"; companion = <&ohci1>; @@ -924,8 +928,8 @@ usb2_phy0: usb-phy@11c50200 { "renesas,rzg2l-usb2-phy"; reg = <0 0x11c50200 0 0x700>; interrupts = ; - clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>, - <&cpg CPG_MOD R9A07G044_USB_U2H0_HCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2H0_HCLK)>; resets = <&phyrst 0>; #phy-cells = <1>; power-domains = <&cpg>; @@ -937,8 +941,8 @@ usb2_phy1: usb-phy@11c70200 { "renesas,rzg2l-usb2-phy"; reg = <0 0x11c70200 0 0x700>; interrupts = ; - clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>, - <&cpg CPG_MOD R9A07G044_USB_U2H1_HCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2H1_HCLK)>; resets = <&phyrst 1>; #phy-cells = <1>; power-domains = <&cpg>; @@ -953,10 +957,10 @@ hsusb: usb@11c60000 { , , ; - clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>, - <&cpg CPG_MOD R9A07G044_USB_U2P_EXR_CPUCLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2P_EXR_CPUCLK)>; resets = <&phyrst 0>, - <&cpg R9A07G044_USB_U2P_EXL_SYSRST>; + <&cpg SOC_CPG_PREFIX(USB_U2P_EXL_SYSRST)>; renesas,buswait = <7>; phys = <&usb2_phy0 3>; phy-names = "usb"; @@ -968,13 +972,13 @@ wdt0: watchdog@12800800 { compatible = "renesas,r9a07g044-wdt", "renesas,rzg2l-wdt"; reg = <0 0x12800800 0 0x400>; - clocks = <&cpg CPG_MOD R9A07G044_WDT0_PCLK>, - <&cpg CPG_MOD R9A07G044_WDT0_CLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(WDT0_PCLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(WDT0_CLK)>; clock-names = "pclk", "oscclk"; interrupts = , ; interrupt-names = "wdt", "perrout"; - resets = <&cpg R9A07G044_WDT0_PRESETN>; + resets = <&cpg SOC_CPG_PREFIX(WDT0_PRESETN)>; power-domains = <&cpg>; status = "disabled"; }; @@ -983,13 +987,13 @@ wdt1: watchdog@12800c00 { compatible = "renesas,r9a07g044-wdt", "renesas,rzg2l-wdt"; reg = <0 0x12800C00 0 0x400>; - clocks = <&cpg CPG_MOD R9A07G044_WDT1_PCLK>, - <&cpg CPG_MOD R9A07G044_WDT1_CLK>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(WDT1_PCLK)>, + <&cpg CPG_MOD SOC_CPG_PREFIX(WDT1_CLK)>; clock-names = "pclk", "oscclk"; interrupts = , ; interrupt-names = "wdt", "perrout"; - resets = <&cpg R9A07G044_WDT1_PRESETN>; + resets = <&cpg SOC_CPG_PREFIX(WDT1_PRESETN)>; power-domains = <&cpg>; status = "disabled"; }; @@ -999,8 +1003,8 @@ ostm0: timer@12801000 { "renesas,ostm"; reg = <0x0 0x12801000 0x0 0x400>; interrupts = ; - clocks = <&cpg CPG_MOD R9A07G044_OSTM0_PCLK>; - resets = <&cpg R9A07G044_OSTM0_PRESETZ>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(OSTM0_PCLK)>; + resets = <&cpg SOC_CPG_PREFIX(OSTM0_PRESETZ)>; power-domains = <&cpg>; status = "disabled"; }; @@ -1010,8 +1014,8 @@ ostm1: timer@12801400 { "renesas,ostm"; reg = <0x0 0x12801400 0x0 0x400>; interrupts = ; - clocks = <&cpg CPG_MOD R9A07G044_OSTM1_PCLK>; - resets = <&cpg R9A07G044_OSTM1_PRESETZ>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(OSTM1_PCLK)>; + resets = <&cpg SOC_CPG_PREFIX(OSTM1_PRESETZ)>; power-domains = <&cpg>; status = "disabled"; }; @@ -1021,8 +1025,8 @@ ostm2: timer@12801800 { "renesas,ostm"; reg = <0x0 0x12801800 0x0 0x400>; interrupts = ; - clocks = <&cpg CPG_MOD R9A07G044_OSTM2_PCLK>; - resets = <&cpg R9A07G044_OSTM2_PRESETZ>; + clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(OSTM2_PCLK)>; + resets = <&cpg SOC_CPG_PREFIX(OSTM2_PRESETZ)>; power-domains = <&cpg>; status = "disabled"; };