From nobody Sat Jun 13 12:28:33 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 DD05C3FB7CE for ; Thu, 7 May 2026 13:53:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778162027; cv=none; b=Nl3yEh4taAkKHonbJTHF52rNSl3P4+OZLp8si0ore9FjSE3VUdG/Kh5+OuqVTIRD7zJkzVGB07BqepHOERMOlUy/DA7R/SOHJuKFyceaDjOcVHN12xYmX3qUVZCnrepyogsdCbkd1BnH/DgtUGNCdTM6I6V4IDQUykyENQreykk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778162027; c=relaxed/simple; bh=OWSx1MMpR9qIKeq9ksKpLzpLKLA05SSYFkqxHQGQPB4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cN7IJWVqLs61n3kqocCeMA0TDdsUWJNg3jAuKRDA50usPOd4VNEYDeiZWFca7QjnxucNcZL93vhlyBrX9DwSJfRevYITHRJtw+jTo54egfewRvnpOiQePocvlwf957ORHq7Ptolz1tpShXBpk/2bX+tq8XsXaKOilrXGurNQX5I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CBAY+WMx; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CBAY+WMx" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-488ad135063so8270555e9.0 for ; Thu, 07 May 2026 06:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778162020; x=1778766820; darn=vger.kernel.org; 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=/yV5eCV14Q3TCkUmPIb/jJ+sajPZ6JHRE3L068KeT1Q=; b=CBAY+WMxkELH7KHWcwMM4egP1XSSCTXx8H2EeWdm7O9AObNVNmt/EZv1Ur/oYz3nkK JZ0Cvge169QITDyGuHQ5+rzmo0BRBLDw+6bsBHJjeqvXTQa+fg6WWqeetAbAJXAtNV/E Bz9+8C15RNrsj/rAc8UH52AK7c88LH2hyZp0/Xnj1J7wgb8k9FBz2fXETvEXM4DbuOg9 2NyK5kXutpQO7Bu1k89kc0fkMGEzpsZtc2i4RX+5CsUqiJqICxaoUvWbXhmAR8n6mORV BZyNTgmdP3EltIXJBewU0U4Gb8mrFGJxjlmuFlcFr+R0NvxJ6gtZ1yeQZvAUJx0xI7+D mK5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778162020; x=1778766820; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=/yV5eCV14Q3TCkUmPIb/jJ+sajPZ6JHRE3L068KeT1Q=; b=LSaKs26CQqH6zV9oroiOiFG3FEaZFo0kGfkfYupS2y47G/+ZO1vFesL/PzZSkV6NWZ nt1HYI8SyeQrjNIjC517z1g2O653rw2G9nA4229v4Nn+n/ZGSBWaH6njP/bO33G++haR paCfbtdU/iZQC3KlY/0oFe+9ZKUdZsflTHqIit7XyPjR8gukeWWoEYn795XS7Cr1vgV4 3GeFTsn0MA03t/S09N5zzci23Yq1o+ZW/MyqEI5uMA1mrK8ZW9zW5fQeo/tyrlDy8+ba cM0lwEsfJKaCZZztydPa0woDWDPuCAk4f7jEhS3zqRE6L7ZsU1JuPeFvT+B4noQVRkTb Pcjg== X-Forwarded-Encrypted: i=1; AFNElJ9BGB5S5Chl0ElaGkcrur2AIQjVuBXR0ngWqdoDCdYYfXImB57Dr9noL7IhW2ZMf0vrpxdP1INsY4LZIxI=@vger.kernel.org X-Gm-Message-State: AOJu0YxAYKUKLGzP+H0/PqOT1VQuXXdkaBOwJxZVzOXX7AtxjOtqmtoe q52ovdSPd1LGcXjJQaR3ApqWj3530EAFv02lYfVbSeb/A1Dq+0Cuv/r3 X-Gm-Gg: AeBDieu7gr/U/BkkY3ZwLFmq0bokIpYLelvMpPGihNFCKegz6ch8aHd9O6yQ0zhVyz4 jm40ovR8LXSovM6AXmM5+clQMDPzQlfLTU4lFFR25yYTLQn0pCSqSvJmVZkFtXMRoNz4bUQa+zL RzpBami18xIU4DPaK9nAXCYfymEgBvAzswraBtpNlEpjYwlAi2HPcDWH5rSg1y1B6n1LNlNL84L DFuyn9naZOSh4MBbKIsjvKfh+95niZ2NONrLggkaMvU8e2tGIh+vFtn2d0oOv3MWFR/EMqvxKac mi0A45cLAOsOsyN8lmk0JdU4TLRF11EatkDeVF1zLldI1e+aVWAgf7UjLngZX2rpomLryu7BBGO RH3NSb5Zlul5sLcNMUOj7SHGa1RA7d9hLwrddt/cjdm7dQe8/nW1l+XsR+U06OzmRUjzcwkSejU 0EF1/FuMxE0SA0EphD6dvG+b0= X-Received: by 2002:a05:600c:1e8a:b0:488:fd7e:1063 with SMTP id 5b1f17b1804b1-48e51f4cdcdmr128182155e9.29.1778162020091; Thu, 07 May 2026 06:53:40 -0700 (PDT) Received: from xeon ([188.163.112.56]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538fad5fsm137882125e9.10.2026.05.07.06.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2026 06:53:39 -0700 (PDT) From: Svyatoslav Ryhel To: Prashant Gaikwad , Michael Turquette , Stephen Boyd , Thierry Reding , Thierry Reding , Jonathan Hunter , Mikko Perttunen , Svyatoslav Ryhel Cc: linux-clk@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/1 RESEND] clk: tegra: set up proper EMC clock implementation for Tegra114 Date: Thu, 7 May 2026 16:53:14 +0300 Message-ID: <20260507135314.76817-2-clamor95@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260507135314.76817-1-clamor95@gmail.com> References: <20260507135314.76817-1-clamor95@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove current emc and emc_mux clocks and replace them with the proper EMC clock implementation for correct EMC driver support. Acked-by: Thierry Reding Signed-off-by: Svyatoslav Ryhel Reviewed-by: Mikko Perttunen --- drivers/clk/tegra/clk-tegra114.c | 39 ++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra= 114.c index 8bde72aa5e68..853ef707654a 100644 --- a/drivers/clk/tegra/clk-tegra114.c +++ b/drivers/clk/tegra/clk-tegra114.c @@ -622,10 +622,6 @@ static const char *mux_plld_out0_plld2_out0[] =3D { }; #define mux_plld_out0_plld2_out0_idx NULL =20 -static const char *mux_pllmcp_clkm[] =3D { - "pll_m_out0", "pll_c_out0", "pll_p_out0", "clk_m", "pll_m_ud", -}; - static const struct clk_div_table pll_re_div_table[] =3D { { .val =3D 0, .div =3D 1 }, { .val =3D 1, .div =3D 2 }, @@ -672,7 +668,6 @@ static struct tegra_clk tegra114_clks[tegra_clk_max] __= initdata =3D { [tegra_clk_csi] =3D { .dt_id =3D TEGRA114_CLK_CSI, .present =3D true }, [tegra_clk_i2c2] =3D { .dt_id =3D TEGRA114_CLK_I2C2, .present =3D true }, [tegra_clk_uartc] =3D { .dt_id =3D TEGRA114_CLK_UARTC, .present =3D true = }, - [tegra_clk_emc] =3D { .dt_id =3D TEGRA114_CLK_EMC, .present =3D true }, [tegra_clk_usb2] =3D { .dt_id =3D TEGRA114_CLK_USB2, .present =3D true }, [tegra_clk_usb3] =3D { .dt_id =3D TEGRA114_CLK_USB3, .present =3D true }, [tegra_clk_vde_8] =3D { .dt_id =3D TEGRA114_CLK_VDE, .present =3D true }, @@ -1048,14 +1043,7 @@ static __init void tegra114_periph_clk_init(void __i= omem *clk_base, 0, 82, periph_clk_enb_refcnt); clks[TEGRA114_CLK_DSIB] =3D clk; =20 - /* emc mux */ - clk =3D clk_register_mux(NULL, "emc_mux", mux_pllmcp_clkm, - ARRAY_SIZE(mux_pllmcp_clkm), - CLK_SET_RATE_NO_REPARENT, - clk_base + CLK_SOURCE_EMC, - 29, 3, 0, &emc_lock); - - clk =3D tegra_clk_register_mc("mc", "emc_mux", clk_base + CLK_SOURCE_EMC, + clk =3D tegra_clk_register_mc("mc", "emc", clk_base + CLK_SOURCE_EMC, &emc_lock); clks[TEGRA114_CLK_MC] =3D clk; =20 @@ -1321,6 +1309,26 @@ static int tegra114_reset_deassert(unsigned long id) return 0; } =20 +static struct clk *tegra114_clk_src_onecell_get(struct of_phandle_args *cl= kspec, + void *data) +{ + struct clk_hw *hw; + struct clk *clk; + + clk =3D of_clk_src_onecell_get(clkspec, data); + if (IS_ERR(clk)) + return clk; + + hw =3D __clk_get_hw(clk); + + if (clkspec->args[0] =3D=3D TEGRA114_CLK_EMC) { + if (!tegra124_clk_emc_driver_available(hw)) + return ERR_PTR(-EPROBE_DEFER); + } + + return clk; +} + static void __init tegra114_clock_init(struct device_node *np) { struct device_node *node; @@ -1368,7 +1376,10 @@ static void __init tegra114_clock_init(struct device= _node *np) tegra_init_special_resets(1, tegra114_reset_assert, tegra114_reset_deassert); =20 - tegra_add_of_provider(np, of_clk_src_onecell_get); + tegra_add_of_provider(np, tegra114_clk_src_onecell_get); + clks[TEGRA114_CLK_EMC] =3D tegra124_clk_register_emc(clk_base, np, + &emc_lock); + tegra_register_devclks(devclks, ARRAY_SIZE(devclks)); =20 tegra_clk_apply_init_table =3D tegra114_clock_apply_init_table; --=20 2.51.0