From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16255135A7C for ; Thu, 25 Jan 2024 18:44:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706208266; cv=none; b=kvme2D0UHRzHoxG4xMwKiEyQcfVpQ65rVNDfzeK8tueXzzC5ohJm2ClE+XnDrpvkDb4oYc3aV5sbYbihXNSLVaZhFIfoMzU7nXt+c8weEdFZruVH/9Es0sx5D0IvlkCqxlp2Pw+P4nq6xLrLBVvV/NTAlOiyQadE2TWNeqNRRGk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706208266; c=relaxed/simple; bh=/VXkqOVy+p5hRZn2U0ploKZX5RPeYpjwLmmaUabJy2c=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=euP3oM0ycVaRNNLugtDDn2tQDMogeGW+2+qFeqlOdGNbbeXq9zeS1oqMWDz1s1BwO0C0xaMH/y5h+hKJhEf7AZQ3foSZmYfqjmoCzvyK0rCjrJzj+GDCpiEM29K+nILMj3Xwkb9vQi7bQtEaqcl2DDq1OB/5d6TbNXCKs6lFKbU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ragnatech.se; spf=pass smtp.mailfrom=ragnatech.se; dkim=pass (2048-bit key) header.d=ragnatech.se header.i=@ragnatech.se header.b=iHmOQ8fM; arc=none smtp.client-ip=209.85.208.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ragnatech.se Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ragnatech.se Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ragnatech.se header.i=@ragnatech.se header.b="iHmOQ8fM" Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2ccec119587so90759791fa.0 for ; Thu, 25 Jan 2024 10:44:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech.se; s=google; t=1706208261; x=1706813061; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=jNBR0V2tdOtWl9sN4OPxy8ML2/Lr7iNCWgLyl+UXpzg=; b=iHmOQ8fMWKFWOqh+i0NqNRTSuPJHBArtHCZ5Vkg8BRqXR9oMVz3AlwS6J0nrN+T7SB AErNY3lzylH0wiGHUHtoc9Y3bdrgzlaDwzgMqDribqLROmDWyBWTiqg0ZXm0TfYiPFpo PfPapfrM72zl3k7Pclf50TIsvc44QS4DowWYLUoXVY7IjaeyoJBYkewq4lHb+lbY8jG2 nQTyGtv0vwMJFpd4i2DnzM+Ba1Pqp7typ7aA3vMJmB7KRT5HeiO3uUJvWbkTq5UnyY0N WHHG3a/+dQJ89Mst6NPqdzUf2T2R9Sua7TNm7WGUT54MTF3mkn+SBtKYtS7S8j/iLhGw G0Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706208261; x=1706813061; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jNBR0V2tdOtWl9sN4OPxy8ML2/Lr7iNCWgLyl+UXpzg=; b=F4FZRWyM1eQKX1TSn86fhSzMhzLH/r9y7G16C74l1Jg6uymLU5wMqlGpkChCEia+Xj RQaBy2pXDNUqYylqjODPs/ZAZ734/EbzG4vRqEu8WfXSDA796UT3TZA4QRpGiPg3pWDF 8FMSk9pm8wtesiDFfA2Tb3P6mOB+4Q0LllbW+cJSNCf/4qkt5fdsIZ6bgeFzVWVFHHqI 4AEktHSbv8D9i4KCYPRHGbEVRAfAO08bUjtcEvPuIJcGkEeDi6XFXATBHq6ngnFtUl54 NUq/3Xuo3l3RQQbc06Ki6Sifql2/5CQffk1RAiR3mG9GmxDcYuXtdu74Tvu82hBVFBwZ UOUw== X-Gm-Message-State: AOJu0Yw49/tl8PKXp9sAtr03Qf5girp8vQwxAZQ6jpN7S3BPOO5cJ93z LrgYkOYLzwYHgtyyRr+63LQQ5LEM8vDRJJjC+a5CRYn0QUI1nyzaPqWrwpwpvQA= X-Google-Smtp-Source: AGHT+IH/O6MrFwuZV5ej60IU/AKeePycEpY0pY0oQQPo9z83ZkFFB531nzKovK//Rw9Hh97Td5KA8Q== X-Received: by 2002:a2e:b705:0:b0:2cf:2d0:224f with SMTP id j5-20020a2eb705000000b002cf02d0224fmr40539ljo.31.1706208261058; Thu, 25 Jan 2024 10:44:21 -0800 (PST) Received: from localhost (h-46-59-36-113.A463.priv.bahnhof.se. [46.59.36.113]) by smtp.gmail.com with ESMTPSA id w3-20020a05651c118300b002cdb6a40096sm353113ljo.131.2024.01.25.10.44.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 10:44:20 -0800 (PST) Date: Thu, 25 Jan 2024 19:44:20 +0100 From: Niklas =?utf-8?Q?S=C3=B6derlund?= To: Geert Uytterhoeven Cc: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm , Catalin Marinas , Will Deacon , Ulf Hansson , Cong Dang , Duy Nguyen , Hai Pham , Linh Phung , linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Subject: Re: [PATCH v2 08/15] clk: renesas: cpg-mssr: Add support for R-Car V4M Message-ID: <20240125184420.GN4126432@ragnatech.se> References: Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Hi Geert, On 2024-01-25 16:34:36 +0100, Geert Uytterhoeven wrote: > From: Cong Dang > > Initial CPG support for the R-Car V4M (R8A779H0). > > Signed-off-by: Cong Dang > Signed-off-by: Geert Uytterhoeven I have not checked every value in the table but those I have checked looks good. Acked-by: Niklas Söderlund > --- > v2: > - Add vendor-prefix to DT binding definition header file, > - Add missing CP core clock. > > Changes compared to the BSP: > - Merge two patches, > - Fix whitespace in Makefile, > - Rename VIOSCR/VCSCR to VIOSRC/VCSRC, > - Rename "zN" to "zcN" to match documentation, > - Change register bitfield offsets for zc[1-3] from 0 to actual > values, > - Change parent of IMPBSRC/VIOSRC/VCSRC from PLL1_DIV2 to PLL1, > - Add missing SD0H clock, > - Change parent of SD0 from SDSRC to SD0H, > - Fix No newline at end of file. > --- > drivers/clk/renesas/Kconfig | 5 + > drivers/clk/renesas/Makefile | 1 + > drivers/clk/renesas/r8a779h0-cpg-mssr.c | 241 ++++++++++++++++++++++++ > drivers/clk/renesas/renesas-cpg-mssr.c | 6 + > drivers/clk/renesas/renesas-cpg-mssr.h | 1 + > 5 files changed, 254 insertions(+) > create mode 100644 drivers/clk/renesas/r8a779h0-cpg-mssr.c > > diff --git a/drivers/clk/renesas/Kconfig b/drivers/clk/renesas/Kconfig > index 69396e19795903e8..d252150402e86366 100644 > --- a/drivers/clk/renesas/Kconfig > +++ b/drivers/clk/renesas/Kconfig > @@ -33,6 +33,7 @@ config CLK_RENESAS > select CLK_R8A779A0 if ARCH_R8A779A0 > select CLK_R8A779F0 if ARCH_R8A779F0 > select CLK_R8A779G0 if ARCH_R8A779G0 > + select CLK_R8A779H0 if ARCH_R8A779H0 > select CLK_R9A06G032 if ARCH_R9A06G032 > select CLK_R9A07G043 if ARCH_R9A07G043 > select CLK_R9A07G044 if ARCH_R9A07G044 > @@ -165,6 +166,10 @@ config CLK_R8A779G0 > bool "R-Car V4H clock support" if COMPILE_TEST > select CLK_RCAR_GEN4_CPG > > +config CLK_R8A779H0 > + bool "R-Car V4M clock support" if COMPILE_TEST > + select CLK_RCAR_GEN4_CPG > + > config CLK_R9A06G032 > bool "RZ/N1D clock support" if COMPILE_TEST > > diff --git a/drivers/clk/renesas/Makefile b/drivers/clk/renesas/Makefile > index 879a07d445f9056a..f7e18679c3b81b97 100644 > --- a/drivers/clk/renesas/Makefile > +++ b/drivers/clk/renesas/Makefile > @@ -30,6 +30,7 @@ obj-$(CONFIG_CLK_R8A77995) += r8a77995-cpg-mssr.o > obj-$(CONFIG_CLK_R8A779A0) += r8a779a0-cpg-mssr.o > obj-$(CONFIG_CLK_R8A779F0) += r8a779f0-cpg-mssr.o > obj-$(CONFIG_CLK_R8A779G0) += r8a779g0-cpg-mssr.o > +obj-$(CONFIG_CLK_R8A779H0) += r8a779h0-cpg-mssr.o > obj-$(CONFIG_CLK_R9A06G032) += r9a06g032-clocks.o > obj-$(CONFIG_CLK_R9A07G043) += r9a07g043-cpg.o > obj-$(CONFIG_CLK_R9A07G044) += r9a07g044-cpg.o > diff --git a/drivers/clk/renesas/r8a779h0-cpg-mssr.c b/drivers/clk/renesas/r8a779h0-cpg-mssr.c > new file mode 100644 > index 0000000000000000..1259b8544980f07a > --- /dev/null > +++ b/drivers/clk/renesas/r8a779h0-cpg-mssr.c > @@ -0,0 +1,241 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * r8a779h0 Clock Pulse Generator / Module Standby and Software Reset > + * > + * Copyright (C) 2023 Renesas Electronics Corp. > + * > + * Based on r8a779g0-cpg-mssr.c > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > + > +#include "renesas-cpg-mssr.h" > +#include "rcar-gen4-cpg.h" > + > +enum clk_ids { > + /* Core Clock Outputs exported to DT */ > + LAST_DT_CORE_CLK = R8A779H0_CLK_R, > + > + /* External Input Clocks */ > + CLK_EXTAL, > + CLK_EXTALR, > + > + /* Internal Core Clocks */ > + CLK_MAIN, > + CLK_PLL1, > + CLK_PLL2, > + CLK_PLL3, > + CLK_PLL4, > + CLK_PLL5, > + CLK_PLL6, > + CLK_PLL1_DIV2, > + CLK_PLL2_DIV2, > + CLK_PLL3_DIV2, > + CLK_PLL4_DIV2, > + CLK_PLL4_DIV5, > + CLK_PLL5_DIV2, > + CLK_PLL5_DIV4, > + CLK_PLL6_DIV2, > + CLK_S0, > + CLK_S0_VIO, > + CLK_S0_VC, > + CLK_S0_HSC, > + CLK_SASYNCPER, > + CLK_SV_VIP, > + CLK_SV_IR, > + CLK_IMPASRC, > + CLK_IMPBSRC, > + CLK_VIOSRC, > + CLK_VCSRC, > + CLK_SDSRC, > + CLK_RPCSRC, > + CLK_OCO, > + > + /* Module Clocks */ > + MOD_CLK_BASE > +}; > + > +static const struct cpg_core_clk r8a779h0_core_clks[] = { > + /* External Clock Inputs */ > + DEF_INPUT("extal", CLK_EXTAL), > + DEF_INPUT("extalr", CLK_EXTALR), > + > + /* Internal Core Clocks */ > + DEF_BASE(".main", CLK_MAIN, CLK_TYPE_GEN4_MAIN, CLK_EXTAL), > + DEF_BASE(".pll1", CLK_PLL1, CLK_TYPE_GEN4_PLL1, CLK_MAIN), > + DEF_BASE(".pll2", CLK_PLL2, CLK_TYPE_GEN4_PLL2, CLK_MAIN), > + DEF_BASE(".pll3", CLK_PLL3, CLK_TYPE_GEN4_PLL3, CLK_MAIN), > + DEF_BASE(".pll4", CLK_PLL4, CLK_TYPE_GEN4_PLL4, CLK_MAIN), > + DEF_BASE(".pll5", CLK_PLL5, CLK_TYPE_GEN4_PLL5, CLK_MAIN), > + DEF_BASE(".pll6", CLK_PLL6, CLK_TYPE_GEN4_PLL6, CLK_MAIN), > + > + DEF_FIXED(".pll1_div2", CLK_PLL1_DIV2, CLK_PLL1, 2, 1), > + DEF_FIXED(".pll2_div2", CLK_PLL2_DIV2, CLK_PLL2, 2, 1), > + DEF_FIXED(".pll3_div2", CLK_PLL3_DIV2, CLK_PLL3, 2, 1), > + DEF_FIXED(".pll4_div2", CLK_PLL4_DIV2, CLK_PLL4, 2, 1), > + DEF_FIXED(".pll4_div5", CLK_PLL4_DIV5, CLK_PLL4, 5, 1), > + DEF_FIXED(".pll5_div2", CLK_PLL5_DIV2, CLK_PLL5, 2, 1), > + DEF_FIXED(".pll5_div4", CLK_PLL5_DIV4, CLK_PLL5_DIV2, 2, 1), > + DEF_FIXED(".pll6_div2", CLK_PLL6_DIV2, CLK_PLL6, 2, 1), > + DEF_FIXED(".s0", CLK_S0, CLK_PLL1_DIV2, 2, 1), > + DEF_FIXED(".s0_vio", CLK_S0_VIO, CLK_PLL1_DIV2, 2, 1), > + DEF_FIXED(".s0_vc", CLK_S0_VC, CLK_PLL1_DIV2, 2, 1), > + DEF_FIXED(".s0_hsc", CLK_S0_HSC, CLK_PLL1_DIV2, 2, 1), > + DEF_FIXED(".sasyncper", CLK_SASYNCPER, CLK_PLL5_DIV4, 3, 1), > + DEF_FIXED(".sv_vip", CLK_SV_VIP, CLK_PLL1, 5, 1), > + DEF_FIXED(".sv_ir", CLK_SV_IR, CLK_PLL1, 5, 1), > + DEF_FIXED(".impasrc", CLK_IMPASRC, CLK_PLL1_DIV2, 2, 1), > + DEF_FIXED(".impbsrc", CLK_IMPBSRC, CLK_PLL1, 4, 1), > + DEF_FIXED(".viosrc", CLK_VIOSRC, CLK_PLL1, 6, 1), > + DEF_FIXED(".vcsrc", CLK_VCSRC, CLK_PLL1, 6, 1), > + DEF_BASE(".sdsrc", CLK_SDSRC, CLK_TYPE_GEN4_SDSRC, CLK_PLL5), > + DEF_BASE(".rpcsrc", CLK_RPCSRC, CLK_TYPE_GEN4_RPCSRC, CLK_PLL5), > + DEF_RATE(".oco", CLK_OCO, 32768), > + > + /* Core Clock Outputs */ > + DEF_GEN4_Z("zc0", R8A779H0_CLK_ZC0, CLK_TYPE_GEN4_Z, CLK_PLL2_DIV2, 2, 0), > + DEF_GEN4_Z("zc1", R8A779H0_CLK_ZC1, CLK_TYPE_GEN4_Z, CLK_PLL2_DIV2, 2, 8), > + DEF_GEN4_Z("zc2", R8A779H0_CLK_ZC2, CLK_TYPE_GEN4_Z, CLK_PLL2_DIV2, 2, 32), > + DEF_GEN4_Z("zc3", R8A779H0_CLK_ZC3, CLK_TYPE_GEN4_Z, CLK_PLL2_DIV2, 2, 40), > + DEF_FIXED("s0d2", R8A779H0_CLK_S0D2, CLK_S0, 2, 1), > + DEF_FIXED("s0d3", R8A779H0_CLK_S0D3, CLK_S0, 3, 1), > + DEF_FIXED("s0d4", R8A779H0_CLK_S0D4, CLK_S0, 4, 1), > + DEF_FIXED("cl16m", R8A779H0_CLK_CL16M, CLK_S0, 48, 1), > + DEF_FIXED("s0d2_rt", R8A779H0_CLK_S0D2_RT, CLK_S0, 2, 1), > + DEF_FIXED("s0d3_rt", R8A779H0_CLK_S0D3_RT, CLK_S0, 3, 1), > + DEF_FIXED("s0d4_rt", R8A779H0_CLK_S0D4_RT, CLK_S0, 4, 1), > + DEF_FIXED("s0d6_rt", R8A779H0_CLK_S0D6_RT, CLK_S0, 6, 1), > + DEF_FIXED("cl16m_rt", R8A779H0_CLK_CL16M_RT, CLK_S0, 48, 1), > + DEF_FIXED("s0d2_per", R8A779H0_CLK_S0D2_PER, CLK_S0, 2, 1), > + DEF_FIXED("s0d3_per", R8A779H0_CLK_S0D3_PER, CLK_S0, 3, 1), > + DEF_FIXED("s0d4_per", R8A779H0_CLK_S0D4_PER, CLK_S0, 4, 1), > + DEF_FIXED("s0d6_per", R8A779H0_CLK_S0D6_PER, CLK_S0, 6, 1), > + DEF_FIXED("s0d12_per", R8A779H0_CLK_S0D12_PER, CLK_S0, 12, 1), > + DEF_FIXED("s0d24_per", R8A779H0_CLK_S0D24_PER, CLK_S0, 24, 1), > + DEF_FIXED("cl16m_per", R8A779H0_CLK_CL16M_PER, CLK_S0, 48, 1), > + DEF_FIXED("s0d2_mm", R8A779H0_CLK_S0D2_MM, CLK_S0, 2, 1), > + DEF_FIXED("s0d4_mm", R8A779H0_CLK_S0D4_MM, CLK_S0, 4, 1), > + DEF_FIXED("cl16m_mm", R8A779H0_CLK_CL16M_MM, CLK_S0, 48, 1), > + DEF_FIXED("s0d2_u3dg", R8A779H0_CLK_S0D2_U3DG, CLK_S0, 2, 1), > + DEF_FIXED("s0d4_u3dg", R8A779H0_CLK_S0D4_U3DG, CLK_S0, 4, 1), > + DEF_FIXED("s0d1_vio", R8A779H0_CLK_S0D1_VIO, CLK_S0_VIO, 1, 1), > + DEF_FIXED("s0d2_vio", R8A779H0_CLK_S0D2_VIO, CLK_S0_VIO, 2, 1), > + DEF_FIXED("s0d4_vio", R8A779H0_CLK_S0D4_VIO, CLK_S0_VIO, 4, 1), > + DEF_FIXED("s0d8_vio", R8A779H0_CLK_S0D8_VIO, CLK_S0_VIO, 8, 1), > + DEF_FIXED("s0d1_vc", R8A779H0_CLK_S0D1_VC, CLK_S0_VC, 1, 1), > + DEF_FIXED("s0d2_vc", R8A779H0_CLK_S0D2_VC, CLK_S0_VC, 2, 1), > + DEF_FIXED("s0d4_vc", R8A779H0_CLK_S0D4_VC, CLK_S0_VC, 4, 1), > + DEF_FIXED("s0d1_hsc", R8A779H0_CLK_S0D1_HSC, CLK_S0_HSC, 1, 1), > + DEF_FIXED("s0d2_hsc", R8A779H0_CLK_S0D2_HSC, CLK_S0_HSC, 2, 1), > + DEF_FIXED("s0d4_hsc", R8A779H0_CLK_S0D4_HSC, CLK_S0_HSC, 4, 1), > + DEF_FIXED("s0d8_hsc", R8A779H0_CLK_S0D8_HSC, CLK_S0_HSC, 8, 1), > + DEF_FIXED("cl16m_hsc", R8A779H0_CLK_CL16M_HSC, CLK_S0_HSC, 48, 1), > + DEF_FIXED("sasyncrt", R8A779H0_CLK_SASYNCRT, CLK_PLL5_DIV4, 48, 1), > + DEF_FIXED("sasyncperd1", R8A779H0_CLK_SASYNCPERD1, CLK_SASYNCPER, 1, 1), > + DEF_FIXED("sasyncperd2", R8A779H0_CLK_SASYNCPERD2, CLK_SASYNCPER, 2, 1), > + DEF_FIXED("sasyncperd4", R8A779H0_CLK_SASYNCPERD4, CLK_SASYNCPER, 4, 1), > + DEF_FIXED("svd1_vip", R8A779H0_CLK_SVD1_VIP, CLK_SV_VIP, 1, 1), > + DEF_FIXED("svd2_vip", R8A779H0_CLK_SVD2_VIP, CLK_SV_VIP, 2, 1), > + DEF_FIXED("svd1_ir", R8A779H0_CLK_SVD1_IR, CLK_SV_IR, 1, 1), > + DEF_FIXED("svd2_ir", R8A779H0_CLK_SVD2_IR, CLK_SV_IR, 2, 1), > + DEF_FIXED("cbfusa", R8A779H0_CLK_CBFUSA, CLK_EXTAL, 2, 1), > + DEF_FIXED("cpex", R8A779H0_CLK_CPEX, CLK_EXTAL, 2, 1), > + DEF_FIXED("cp", R8A779H0_CLK_CP, CLK_EXTAL, 2, 1), > + DEF_FIXED("impad1", R8A779H0_CLK_IMPAD1, CLK_IMPASRC, 1, 1), > + DEF_FIXED("impad4", R8A779H0_CLK_IMPAD4, CLK_IMPASRC, 4, 1), > + DEF_FIXED("impb", R8A779H0_CLK_IMPB, CLK_IMPBSRC, 1, 1), > + DEF_FIXED("viobusd1", R8A779H0_CLK_VIOBUSD1, CLK_VIOSRC, 1, 1), > + DEF_FIXED("viobusd2", R8A779H0_CLK_VIOBUSD2, CLK_VIOSRC, 2, 1), > + DEF_FIXED("vcbusd1", R8A779H0_CLK_VCBUSD1, CLK_VCSRC, 1, 1), > + DEF_FIXED("vcbusd2", R8A779H0_CLK_VCBUSD2, CLK_VCSRC, 2, 1), > + DEF_DIV6P1("canfd", R8A779H0_CLK_CANFD, CLK_PLL5_DIV4, 0x878), > + DEF_DIV6P1("csi", R8A779H0_CLK_CSI, CLK_PLL5_DIV4, 0x880), > + DEF_FIXED("dsiref", R8A779H0_CLK_DSIREF, CLK_PLL5_DIV4, 48, 1), > + DEF_DIV6P1("dsiext", R8A779H0_CLK_DSIEXT, CLK_PLL5_DIV4, 0x884), > + DEF_DIV6P1("mso", R8A779H0_CLK_MSO, CLK_PLL5_DIV4, 0x87c), > + > + DEF_GEN4_SDH("sd0h", R8A779H0_CLK_SD0H, CLK_SDSRC, 0x870), > + DEF_GEN4_SD("sd0", R8A779H0_CLK_SD0, R8A779H0_CLK_SD0H, 0x870), > + > + DEF_BASE("rpc", R8A779H0_CLK_RPC, CLK_TYPE_GEN4_RPC, CLK_RPCSRC), > + DEF_BASE("rpcd2", R8A779H0_CLK_RPCD2, CLK_TYPE_GEN4_RPCD2, R8A779H0_CLK_RPC), > + > + DEF_GEN4_OSC("osc", R8A779H0_CLK_OSC, CLK_EXTAL, 8), > + DEF_GEN4_MDSEL("r", R8A779H0_CLK_R, 29, CLK_EXTALR, 1, CLK_OCO, 1), > +}; > + > +static const struct mssr_mod_clk r8a779h0_mod_clks[] = { > + DEF_MOD("hscif0", 514, R8A779H0_CLK_SASYNCPERD1), > + DEF_MOD("hscif1", 515, R8A779H0_CLK_SASYNCPERD1), > + DEF_MOD("hscif2", 516, R8A779H0_CLK_SASYNCPERD1), > + DEF_MOD("hscif3", 517, R8A779H0_CLK_SASYNCPERD1), > +}; > + > +/* > + * CPG Clock Data > + */ > +/* > + * MD EXTAL PLL1 PLL2 PLL3 PLL4 PLL5 PLL6 OSC > + * 14 13 (MHz) > + * ------------------------------------------------------------------------ > + * 0 0 16.66 / 1 x192 x204 x192 x144 x192 x168 /16 > + * 0 1 20 / 1 x160 x170 x160 x120 x160 x140 /19 > + * 1 0 Prohibited setting > + * 1 1 33.33 / 2 x192 x204 x192 x144 x192 x168 /32 > + */ > +#define CPG_PLL_CONFIG_INDEX(md) ((((md) & BIT(14)) >> 13) | \ > + (((md) & BIT(13)) >> 13)) > + > +static const struct rcar_gen4_cpg_pll_config cpg_pll_configs[4] = { > + /* EXTAL div PLL1 mult/div PLL2 mult/div PLL3 mult/div PLL4 mult/div PLL5 mult/div PLL6 mult/div OSC prediv */ > + { 1, 192, 1, 240, 1, 192, 1, 240, 1, 192, 1, 168, 1, 16, }, > + { 1, 160, 1, 200, 1, 160, 1, 200, 1, 160, 1, 140, 1, 19, }, > + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, > + { 2, 192, 1, 240, 1, 192, 1, 240, 1, 192, 1, 168, 1, 32, }, > +}; > + > +static int __init r8a779h0_cpg_mssr_init(struct device *dev) > +{ > + const struct rcar_gen4_cpg_pll_config *cpg_pll_config; > + u32 cpg_mode; > + int error; > + > + error = rcar_rst_read_mode_pins(&cpg_mode); > + if (error) > + return error; > + > + cpg_pll_config = &cpg_pll_configs[CPG_PLL_CONFIG_INDEX(cpg_mode)]; > + if (!cpg_pll_config->extal_div) { > + dev_err(dev, "Prohibited setting (cpg_mode=0x%x)\n", cpg_mode); > + return -EINVAL; > + } > + > + return rcar_gen4_cpg_init(cpg_pll_config, CLK_EXTALR, cpg_mode); > +} > + > +const struct cpg_mssr_info r8a779h0_cpg_mssr_info __initconst = { > + /* Core Clocks */ > + .core_clks = r8a779h0_core_clks, > + .num_core_clks = ARRAY_SIZE(r8a779h0_core_clks), > + .last_dt_core_clk = LAST_DT_CORE_CLK, > + .num_total_core_clks = MOD_CLK_BASE, > + > + /* Module Clocks */ > + .mod_clks = r8a779h0_mod_clks, > + .num_mod_clks = ARRAY_SIZE(r8a779h0_mod_clks), > + .num_hw_mod_clks = 30 * 32, > + > + /* Callbacks */ > + .init = r8a779h0_cpg_mssr_init, > + .cpg_clk_register = rcar_gen4_cpg_clk_register, > + > + .reg_layout = CLK_REG_LAYOUT_RCAR_GEN4, > +}; > diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c > index 23e5a2b46ac132c6..1b421b8097965b70 100644 > --- a/drivers/clk/renesas/renesas-cpg-mssr.c > +++ b/drivers/clk/renesas/renesas-cpg-mssr.c > @@ -871,6 +871,12 @@ static const struct of_device_id cpg_mssr_match[] = { > .compatible = "renesas,r8a779g0-cpg-mssr", > .data = &r8a779g0_cpg_mssr_info, > }, > +#endif > +#ifdef CONFIG_CLK_R8A779H0 > + { > + .compatible = "renesas,r8a779h0-cpg-mssr", > + .data = &r8a779h0_cpg_mssr_info, > + }, > #endif > { /* sentinel */ } > }; > diff --git a/drivers/clk/renesas/renesas-cpg-mssr.h b/drivers/clk/renesas/renesas-cpg-mssr.h > index 80c5b462924ac343..a1d6e0cbcff94813 100644 > --- a/drivers/clk/renesas/renesas-cpg-mssr.h > +++ b/drivers/clk/renesas/renesas-cpg-mssr.h > @@ -180,6 +180,7 @@ extern const struct cpg_mssr_info r8a77995_cpg_mssr_info; > extern const struct cpg_mssr_info r8a779a0_cpg_mssr_info; > extern const struct cpg_mssr_info r8a779f0_cpg_mssr_info; > extern const struct cpg_mssr_info r8a779g0_cpg_mssr_info; > +extern const struct cpg_mssr_info r8a779h0_cpg_mssr_info; > > void __init cpg_mssr_early_init(struct device_node *np, > const struct cpg_mssr_info *info); > -- > 2.34.1 > > -- Kind Regards, Niklas Söderlund