From patchwork Mon Jul 22 06:33:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 813883 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (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 78ED217BA5 for ; Mon, 22 Jul 2024 06:33:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721629997; cv=none; b=QksHtR2rroHEQuGfdSPFwcCIRsBoxZEIqucUrU1tAhVXrwG2rLifez9oxxzq7NBRvWeLpfRgXZM48JXY+zDXYboOGnyBdxY6sJcIjhkQM3wPzuu9+szRcP14FYulq1PMX25iiKNFDtAgB9uO3iHguZlMerPRK1UrzEhsZFZaAvM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721629997; c=relaxed/simple; bh=PN1n9CaTCL1HxBSjtyOCIXUtDYrf4lCA00khcB/7w3M=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=EAFljb/lsGeakR3X4ZZFGaopRj3rX0FWUmUBwuOC7zojh6ghV5Cm7Q8zXX/JxCJDzKsaTfKv8EGzpjcqPKU1kDhhyWjwEtOOimwf5KbMB6gQapbYnJmP96TckfNH8KlFS5JpGGzvKWPqQTMPA1ADL4cdf9kstMPKa7YmHc+RA4k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=wUsowPXU; arc=none smtp.client-ip=209.85.208.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="wUsowPXU" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-595856e2336so4175158a12.1 for ; Sun, 21 Jul 2024 23:33:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721629993; x=1722234793; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xj+wDOWyCzvjTCTUDA0Y6iSTZh2VAEBUpnU4/tK6YAQ=; b=wUsowPXUagBJ12OFgMUSU5mPxKiturgnOj7jXKFuAT6uDHbA5h419IIYYXdCaHucV/ e4koGNChj3y7HzMlsnF80WSFVbueRrRzD+kbM6zzl+Lusn6EQaXp6a7Itdft0xhhzns+ 8G+9oYFqIMKjG/BgumiUleIFJZOxAgjAzasp5mY08MiTa4TbfEqlDib61iUdB8LdSAzs 3+TLAQ10iDLzlv2oCAjbVzQYatDKVtUwiaWRsA4YlW5/apw63S4HF0rPB0zQjbWKEA9E WVLfieW7LJQ5Vqg+8443A/TPHkcA8XNcZFPH4f8uZOqINzn8su1IwC1/9M7QVjKDbqT+ meAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721629993; x=1722234793; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xj+wDOWyCzvjTCTUDA0Y6iSTZh2VAEBUpnU4/tK6YAQ=; b=ps2semPJjcRMK4Q7k4sf8V/VN9asekKNwCrO55t8eRgpFWg58k+XK2gezCE/4FHd7O EVgS355pHiL7akfBBfzbzpFOV5UEhCbOHmNYToN9UD9oPlHxk0pLGJ43YKZ+w90RJmPL Zn/dUq/dzBRNmYFkypf8lu7MrQK5EJm3trPiUxoxaz6pRBB7pvB9UybS4aKF29hE8xze 0UcfZ0CcodM4uGjTUCdG5VRJlMPk/6Q9zLyUjiJfSixR0UEwHusV93RrchtlyXgDME/i YnFMdefZuPcy9CqOFchqBrFkcGjAeQgluqrDAV4ybxZkwHqmX7hChRbuNPkKby+7nT+P yPmg== X-Forwarded-Encrypted: i=1; AJvYcCVrf2FBLzhUCY2xiJ/zMHR32zMJvQHVsrBxoR1NwU4ymrLIa/mb5f5meUCXV9zfZGbPLvnlIbjxSxZYimnbbeQvVMD2OOm+12aI7jxX1yKxnpo= X-Gm-Message-State: AOJu0YyxLOvAZ8LuK9e2uLyVqqbxCLHJU1I5yocX+6flsOYQv55u9/F+ IeieQvdFAGOxhVCKn5qc8U8mRnDxY/buXEZpKxBznFIsBpAK2XRHNuaVFLxjgyM= X-Google-Smtp-Source: AGHT+IFZgwQ8kBjg7wQirGUAy1IQokyWZyFwi8jSTwEZ3OWVxp38Ndo890Qs2NlTwlbxjDVAmkOW7A== X-Received: by 2002:a50:c05b:0:b0:57d:455:d395 with SMTP id 4fb4d7f45d1cf-5a2caf4e97fmr9818292a12.7.1721629992621; Sun, 21 Jul 2024 23:33:12 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5a4c7e67af1sm3319217a12.56.2024.07.21.23.33.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jul 2024 23:33:12 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Sylwester Nawrocki , Chanwoo Choi , Alim Akhtar , Michael Turquette , Stephen Boyd , Marek Szyprowski , Sam Protsenko , linux-samsung-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Artur Weber , stable@vger.kernel.org Subject: [PATCH] clk: samsung: fix getting Exynos4 fin_pll rate from external clocks Date: Mon, 22 Jul 2024 08:33:09 +0200 Message-ID: <20240722063309.60054-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-samsung-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Commit 0dc83ad8bfc9 ("clk: samsung: Don't register clkdev lookup for the fixed rate clocks") claimed registering clkdev lookup is not necessary anymore, but that was not entirely true: Exynos4210/4212/4412 clock code still relied on it to get the clock rate of xxti or xusbxti external clocks. Drop that requirement by accessing already registered clk_hw when looking up the xxti/xusbxti rate. Reported-by: Artur Weber Closes: https://lore.kernel.org/all/6227c1fb-d769-462a-b79b-abcc15d3db8e@gmail.com/ Fixes: 0dc83ad8bfc9 ("clk: samsung: Don't register clkdev lookup for the fixed rate clocks") Cc: Signed-off-by: Krzysztof Kozlowski Tested-by: Artur Weber # Exynos4212 --- drivers/clk/samsung/clk-exynos4.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/clk/samsung/clk-exynos4.c b/drivers/clk/samsung/clk-exynos4.c index a026ccca7315..28945b6b0ee1 100644 --- a/drivers/clk/samsung/clk-exynos4.c +++ b/drivers/clk/samsung/clk-exynos4.c @@ -1040,19 +1040,20 @@ static unsigned long __init exynos4_get_xom(void) static void __init exynos4_clk_register_finpll(struct samsung_clk_provider *ctx) { struct samsung_fixed_rate_clock fclk; - struct clk *clk; - unsigned long finpll_f = 24000000; + unsigned long finpll_f; + unsigned int parent; char *parent_name; unsigned int xom = exynos4_get_xom(); parent_name = xom & 1 ? "xusbxti" : "xxti"; - clk = clk_get(NULL, parent_name); - if (IS_ERR(clk)) { + parent = xom & 1 ? CLK_XUSBXTI : CLK_XXTI; + + finpll_f = clk_hw_get_rate(ctx->clk_data.hws[parent]); + if (!finpll_f) { pr_err("%s: failed to lookup parent clock %s, assuming " "fin_pll clock frequency is 24MHz\n", __func__, parent_name); - } else { - finpll_f = clk_get_rate(clk); + finpll_f = 24000000; } fclk.id = CLK_FIN_PLL;