From nobody Fri Jul 24 22:54:57 2026 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 9EE3935C6AE for ; Wed, 22 Jul 2026 14:48:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784731718; cv=none; b=YJoVOPexuP03Mw3pe6k+XoDNC3FwkfnNcrTSBAm6W6WEmeyRTJjHTstvzuSF/KFZ9KfHfHDKDB28rNWGi1/qdaDYB6DP9GfHpvOcqB9x94yDHJ3rmTzwEao5AS4NvRP6nsTXxWYUcPoZuwk+eDCbX9N1Y4WVCyj/vPSJkUf2K5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784731718; c=relaxed/simple; bh=h886BmU9pfC+RezdnkZ3J5Ik53qoiogLhSBSntAHgiM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nvvmC621XVCY+Lj80yq92JQAOfmzZxwNr4+7lQjSAYFEtgOc7c5ilvGjqWbaMNqerYgh7kF6ZoAlJJUxeMBpz4WeFgKoZO8a7X6oMnCMeCBX5vBcYiyJqhFWANvB9wYltRiCskeyugFAxWIjfN0GT/6jWfNWNybrXfQsUgduukE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b=dJniUK3h; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b="dJniUK3h" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-47f633e6058so5099506f8f.0 for ; Wed, 22 Jul 2026 07:48:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1784731715; x=1785336515; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=unyjlYSQAHCuBkgYy9GiPNfKBr8X4sZKbeG1doQS/7s=; b=dJniUK3h8iJkQSNGisgAhKUCHX1qHCTGfkFLoIBB14AB/mR+2IrjMPqSF7Xd99qEvZ ZExzUuKH+uUCO3YMEaIi3knMm4rlukchVro55n+LMK2vq+eUrBGKeuxAGrGeABi4AOK6 qffdUm6ZYpAy+oTI1/N7gbe5g39rWZDoS4xnjYtRlOprRYF7S7uZl58frA0vaqkDtsVB i+GXwLmMAn4ivq2Et5II88x499Ltscu85zx5pqBO0f0i5cdUcMSa8+SbByV2UlQNXR8x w/po/TG3ILN/of5nGtP+EBQkApLLllC16BlFIVeweOsBgA1LUo4WAD89aKO5CO3vEJ2j GT7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784731715; x=1785336515; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=unyjlYSQAHCuBkgYy9GiPNfKBr8X4sZKbeG1doQS/7s=; b=if4GF1hiM2qP3iKvaG0i102racC+XVofg8NhiU02qY2CcflU1NwDlv5EIR8zBKaDiN E/gmDrRdZ752ZWAicB4mQI6lyw2AvX0eRbq3k+3VdnkrVd1Fv9doCcHY/Q48an1QPox1 Rz89zHBgzRuRHETb90aPM+L34Soal2kNMPElRJfhYVKF8iNqOFK/QwbO8vk0ryE+BLZL Hsf+WFtxYS+YiFG6JMgh4gYB3GAgO2t+bK6U1IuAW2FX37okAzlrTVZFCk/6pK/8dZtQ TGYMhucrcpcH1sDA0y4ACQEfwbCs+UBduBhXOaa7FT0tsKrIMddfXoqaalrhJhwx4RZ1 qNCg== X-Forwarded-Encrypted: i=1; AHgh+RqNCu4B64BCDaHiRVchV09d+TM952Q3vcQcyxs4Smqdri5fJTz1HT2nbfzPEnMe0mg0GEbGrezOEMCCCH4=@vger.kernel.org X-Gm-Message-State: AOJu0YzNvqognx3asm5PJBSzLsjvyyi7Ko4HOBkyYWT9GwpVa50xUO+b Df5z16PLEelIg368BV1f0XokXnu2+ZBVPC2vUy/tzujSUj1X40GZK2dpsFyHtrRQbyU= X-Gm-Gg: AR+sD134Q1D11iW8Oq/JDZStjCd4nUMVBUE47gZabgD+G16fXkq1T5lcY27gS6zJs8a SFVxWw1PcIZxQ6qe5LZzruEdjbfOsmulcj34oq0JtG1TFd0NXXD7SvNOWDykwgwvq9bQh3xwQak jGpuFE63T30W4YBQ3pMOssTNB/2Q2bMNN5wOsXWVw2JvOeKxHDAkuPWjmF8YjqbSpUEPXZ9I/vh JsahPrAhnRRc1EO6uVEvfMZpLe47lnaVDOIc1hKLlSo/s8dbHkqHFB89zrtag/CKI2k5NIN4RyA wK1Tg5WWuGccC6fNLFEZpFEy13cdWg9+Sd5fan0NCMzrn23LBV5xmkT6pfW6hhRxdO8l8SoZlcQ hfJ6LUicQuyysWOIPYP/BBHIa2r8Ad9qKXj8CjS5xvk/nj/IgXElL/Zwkv40yGeiVkYPG/o2zGQ un X-Received: by 2002:a05:6000:1883:b0:47f:5ec2:d54 with SMTP id ffacd0b85a97d-47f622fd23cmr26607833f8f.5.1784731714820; Wed, 22 Jul 2026 07:48:34 -0700 (PDT) Received: from localhost ([2a01:e0a:3c5:5fb1:a589:14b5:ba97:3626]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-47f85b9a5d9sm6412303f8f.5.2026.07.22.07.48.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 07:48:34 -0700 (PDT) From: Jerome Brunet Date: Wed, 22 Jul 2026 16:48:19 +0200 Subject: [PATCH v6 1/4] clk: sunxi-ng: mux: fix determine helper rate propagation Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260722-a733-rtc-v6-1-631cca28cc9a@baylibre.com> References: <20260722-a733-rtc-v6-0-631cca28cc9a@baylibre.com> In-Reply-To: <20260722-a733-rtc-v6-0-631cca28cc9a@baylibre.com> To: Junhui Liu , Alexandre Belloni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Michael Turquette , Stephen Boyd , Maxime Ripard Cc: linux-rtc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Jerome Brunet X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4256; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=h886BmU9pfC+RezdnkZ3J5Ik53qoiogLhSBSntAHgiM=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBqYNg6uyta/DkLplo2mqfFr0j3C/ackC1oBeDSi v/Kdomzy+OJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCamDYOgAKCRDm/A8cN/La heNmEAC0b7q6lwuTPE/5GdnaLgm4KEnZMK/5Ab9WcKRFsjyAkSUDgxBrsg8F0oNqu0IPjzYFOJA 1s8fBxBfn2PRXIh3DrGULfbL+R+qA3wx1RxQmeOVIDEzxVSY4y1GTzwRWgs7IgchF9nr+YhGn6H bVmBqo03Aly2UteOQtcyg8QMA+Vq70Z+CfOQJ9xFbZG1jMywPFyVGfMbZKMoLwgvti8oS1fvLvU v9ez3PTmofHI7Yh/dqjxlPJdY8/mVI2dNm/G69mODoU69AcQOY58k20qySvdS80UX2gMI9U16ma DrwXV4q6/GIq7jVQpfJGXa447Q3OZsodLTXtr7ivRIxefJNwFVFTzJ54YctO8ePepKdIKVAiWA3 BqDBFGAAFufNNjhHqzUmxgNhoScAKx3wYHjuqV2iDk18JJT4YhVXS7uGs19cq9nLRwOwD4/tKQa O03g+vGul2Abc8JuMNSoIQEVw5uFbfrQG6jDdFAxGo30jFWVcm6T4N9+dmMYdUPWKGALKNpO1P+ 4qVXaENjXqBtGRDiRQR+9x0QMazD2F8KGNA0+d+vs1/pJHNfbE72Zt/wkyn8FtemqP+H7U3E0ha CU9NM1QNRhj5ibYdPdfSn5RA5l+1ob8oqUsZvxOSt1tp2Hh7FntrDRIJHYFd3+BEJRiB5S9QCp+ W7y0ilfnsEMIPhQ== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 Applying the pre divider on the parent rate is wrong because, while handling rate propagation through determine_rate(), the framework will likely round the parent rate again while cycling through the possibilities, throwing away the prediv applied. This means, the parent rate will then be wrong when the prediv is unapplied from a parent rate on which it was never applied to begin with. The right way to do it is to unapply the prediv from the requested rate, which is the wanted rate at the input on the clock element, and pass this to framework to do its thing. Change the determine rate mux helper in this way. Fixes: 1c8d7af61b37 ("clk: sunxi-ng: convert from divider_round_rate_parent= () to divider_determine_rate()") Signed-off-by: Jerome Brunet --- drivers/clk/sunxi-ng/ccu_mux.c | 57 +++++++++++++++++++++-----------------= ---- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu_mux.c b/drivers/clk/sunxi-ng/ccu_mux.c index 09230728c400..4503c9780c39 100644 --- a/drivers/clk/sunxi-ng/ccu_mux.c +++ b/drivers/clk/sunxi-ng/ccu_mux.c @@ -92,66 +92,65 @@ int ccu_mux_helper_determine_rate(struct ccu_common *co= mmon, struct clk_rate_request adj_req =3D *req; =20 best_parent =3D clk_hw_get_parent(hw); - best_parent_rate =3D clk_hw_get_rate(best_parent); - + adj_req.best_parent_rate =3D clk_hw_get_rate(best_parent); adj_req.best_parent_hw =3D best_parent; - adj_req.best_parent_rate =3D ccu_mux_helper_apply_prediv(common, cm, -1, - best_parent_rate); + + /* + * This effectively treats the predivider as a postdivider. + * It stays mathematically correct and ensures whatever + * round() will do stays correct while walking the tree. + * It may query the parent rate too while handling rate + * propagation. + */ + adj_req.rate =3D ccu_mux_helper_unapply_prediv(common, cm, -1, + req->rate); =20 ret =3D round(cm, &adj_req, data); if (ret) return ret; =20 - best_rate =3D adj_req.rate; - /* - * best_parent_rate might have been modified by our clock. - * Unapply the pre-divider if there's one, and give - * the actual frequency the parent needs to run at. + * parent_rate might have been modified by our clock as part + * of the rate propagation mechanism. Same goes below. */ - best_parent_rate =3D ccu_mux_helper_unapply_prediv(common, cm, -1, - adj_req.best_parent_rate); + best_parent_rate =3D adj_req.best_parent_rate; + best_rate =3D ccu_mux_helper_apply_prediv(common, cm, -1, + adj_req.rate); =20 goto out; } =20 for (i =3D 0; i < clk_hw_get_num_parents(hw); i++) { struct clk_rate_request tmp_req =3D *req; - unsigned long parent_rate; + unsigned long rate; struct clk_hw *parent; =20 parent =3D clk_hw_get_parent_by_index(hw, i); if (!parent) continue; =20 - parent_rate =3D ccu_mux_helper_apply_prediv(common, cm, i, - clk_hw_get_rate(parent)); - tmp_req.best_parent_hw =3D parent; - tmp_req.best_parent_rate =3D parent_rate; + tmp_req.best_parent_rate =3D clk_hw_get_rate(parent); + tmp_req.rate =3D ccu_mux_helper_unapply_prediv(common, cm, i, + req->rate); =20 ret =3D round(cm, &tmp_req, data); if (ret) continue; =20 - /* - * parent_rate might have been modified by our clock. - * Unapply the pre-divider if there's one, and give - * the actual frequency the parent needs to run at. - */ - parent_rate =3D ccu_mux_helper_unapply_prediv(common, cm, i, - tmp_req.best_parent_rate); + rate =3D ccu_mux_helper_apply_prediv(common, cm, i, + tmp_req.rate); =20 - if (tmp_req.rate =3D=3D req->rate) { + if (rate =3D=3D req->rate) { best_parent =3D parent; - best_parent_rate =3D parent_rate; - best_rate =3D tmp_req.rate; + best_parent_rate =3D tmp_req.best_parent_rate; + best_rate =3D rate; goto out; } =20 - if (ccu_is_better_rate(common, req->rate, tmp_req.rate, best_rate)) { - best_rate =3D tmp_req.rate; - best_parent_rate =3D parent_rate; + if (ccu_is_better_rate(common, req->rate, rate, best_rate)) { + best_rate =3D rate; + best_parent_rate =3D tmp_req.best_parent_rate; best_parent =3D parent; } } --=20 2.47.3 From nobody Fri Jul 24 22:54:57 2026 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 CC3B036BCDA for ; Wed, 22 Jul 2026 14:48:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784731721; cv=none; b=EDszmSMCDcl3oVeKtvUSdttz3roXvbjBiQEWmGPoq9HKpkx5VkzKCwiJMAAF0560L2obNtCIuTwFll1kPZrmt/53DunhJvwiPcmNU7acdHMA84pG1ohmkOB6lxtvAXYGH6zXxBGi/ysO4drEl0EjDM9JXjgnzjHC0eMzzZmZTwc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784731721; c=relaxed/simple; bh=vX/TCHLAjOkQRelKPMwYvdNToDOf4unxRAm1iZEzSxs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=baVvUoyWslnczeUTokAjjKhw2Tox1thI2BAGI/AL27bW8TJVivnkssUD4c7WB/43ufRwVP9Q1srpZwxm0diIzym6UsRE4gqcXdvwd0adnwaOeuXBg+tys3CvzPh3TEZdnHrhSa1J5WK3J8x0/jI1ok5lUQ1rqpdWdVY1ylJew8o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b=QzRVsyKV; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b="QzRVsyKV" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-47c6e9a694bso7218200f8f.1 for ; Wed, 22 Jul 2026 07:48:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1784731717; x=1785336517; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=sCHBjnXnCbVICbmg1fFBQry3N4DeY7D0jzFS6saVNag=; b=QzRVsyKVKtvOleXrOe5T0oV2kdOo1SgMSrlJbhyyV0UHlZXaRKWuxgmS4CmangpX7R jJRtH8JDUaKVPkWR5TuCbQ3FbDBWag+MLN6SZSMibUPs+fS9L9b1rmJHfBRqO6N06T1Y QR9mFuIiABhyxE8giNv9Equ0AufN4Ci+7DSC0R31JLYxbf7kHWYYLznmS2XngjxaQ9HL Qlf86MnT3fx1ZHvPj1CG8qeMHqPya/QU65/gQ6eSLfy+zgs5QnQAYPOkp8CoarbSRwrr z/ybAPIBoS3qkLZjgl02SEDT4Yr4xfPbrZrHjbZNgg7ZuEHmxW66lP74kSi80yKEvwnN YDYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784731717; x=1785336517; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=sCHBjnXnCbVICbmg1fFBQry3N4DeY7D0jzFS6saVNag=; b=eP8XdHkyKYaxYpWM/JQUcbBqE6D9HOYrplJrUQKzRqQI/3qHXqwh62T48ULIERNpKH SEAxekQA0CC67avTJfYChWv+jhuGP2Ok10E5bTFNLs5YxLyrA98BMqvhhac92GUo540B RWlqeY1Ybz9hXhMudkWEZ2dpk8rUTizvO7eHlGQSdwPgKgNwuV0COnrI9oUi0jcNWLKz IX6xgEy/i3aHmrQY43y8niHrW0fgXdqKzb03S2qJTEMOuDRoSJ/tJH4HHgBjnhjVBodP xovP5ao5Qr0aELaddWu08ME8h4xHscfSPJSZv4Bz0ogN+TL1dpK97LfS/2VCdtErHMEH k0nA== X-Forwarded-Encrypted: i=1; AHgh+RpR7Cs13OWz09F3Wa+AiV3pK9KtLP/KKa/yaw1DCq1J52tEiEovP3OkF5Onp7TLE1kobZa3LbglxAfngUA=@vger.kernel.org X-Gm-Message-State: AOJu0YwmhGsWewKP8XGhcb2rIXYunQHEIm/df1DFnLSbalkMxfdZbreA /pQsYzG07tVtBiWvUvZsN6rveUpnZs5R3aIIGvHX/MW98ZvcloBP59wXAY/cyB+VllA= X-Gm-Gg: AR+sD13QdhDFkvWCVNoY51PcDrL9gN4V9fjMVIVK9qt/KM8b5AL4QdfoZYFRbJcFIWY ZZhC7XvI6mnywIa0Cr1LLVHP7CaWpuFpAjabMRe765jZhQC1SmUweyD2QRBon1EAo/PwDdEhlpR 2P80NoMgJOtbCu6o09cn4NUvWYy3YkwHTovy387lqIDNdexFFF+RZSy+8InNsZ4gVdD85CNUl9V ewM4w/a57vib6gml4f4+AXewrhegpZv2kCo9yuPE1VgmNR25Kf2/gIWgtZPXyg0plzO/+ttbrKW 0tA5GUR00I1zWxEtQBkUZpE8yljz8+FfTS2OnKyqNPtdtgbpN0R3WIr+PY8RhpOrJoGDEIZHTtu v4XgaVHFEZG5qCQMeBA5Wdj+KRQ9LaDAm/KjPYebvLgGjbVdbu0BqfKwfHc0dKBCMFbfnjy7XsK DE X-Received: by 2002:a05:6000:298e:20b0:47f:6d4e:4cdf with SMTP id ffacd0b85a97d-47f6d4e4e09mr15710230f8f.58.1784731716959; Wed, 22 Jul 2026 07:48:36 -0700 (PDT) Received: from localhost ([2a01:e0a:3c5:5fb1:a589:14b5:ba97:3626]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-47f85bd77a9sm6306269f8f.14.2026.07.22.07.48.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 07:48:36 -0700 (PDT) From: Jerome Brunet Date: Wed, 22 Jul 2026 16:48:20 +0200 Subject: [PATCH v6 2/4] clk: sunxi-ng: div: add read-only operation support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260722-a733-rtc-v6-2-631cca28cc9a@baylibre.com> References: <20260722-a733-rtc-v6-0-631cca28cc9a@baylibre.com> In-Reply-To: <20260722-a733-rtc-v6-0-631cca28cc9a@baylibre.com> To: Junhui Liu , Alexandre Belloni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Michael Turquette , Stephen Boyd , Maxime Ripard Cc: linux-rtc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Jerome Brunet X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3700; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=vX/TCHLAjOkQRelKPMwYvdNToDOf4unxRAm1iZEzSxs=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBqYNg70PtrvTpA4LWczjYUn7V/UXWZ9hOuvW3P+ O0Lia3J/vCJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCamDYOwAKCRDm/A8cN/La hawdEACxatHfiQJA9GAhWuY+R5eP92r1ye/bpxxeNgaevjHIs1u1UMo3XqTzbVP8rgDpmw8zmyy Ja0tqYLVTqx74NMqLcBPuXXRe41PSxyc301FcUQcqW2B5CQJoit2dSnsRPtDMm/IDoWOKnap94U ZMe2fz7U3BVo2nHwhNrLD6dx7WBwi3QFAxwoipIHvht+RwqKTgfMi4YEBzL4bDP1kJi3AmTKj0j psjlQmncda6vKprmIHEu1gY1sCzcwb+qrVm1Ml5cG7zRMfr2f4MbjOfc5ka6B3JnDl7W20dOUid xrnLMrxixVCexbbvR/868TGSe7hsYXhlcOLFxVGyr1okgk925IE9+UuFSg5tMU4NQlGvB547MPs 1UqorgDd6oITa9OUx4gTwKPfZ0C01mVBSjZy0SIv0I/eiHm2b906V3YcRQ34n2ASEc5RC5nZ1v+ B2M7aXJPTRVAhuCZ7Z8TO0oSvyRL2Yr0lfSFxCTYcKS/xAh+BrRw8MbW0CC6SIke1vqh6+PALZ6 Da4z/sKrP3Eqm2LG8trpNsIcwcqGXtrHwTuzTkkOsDtcFP9TlB5lTVAIkIL6pWD8KFEy1fVmV3/ Xz3/AQPG/D2jiPSBQrFIVGdICFEK2ppSHclER7XEBL/Ql0yyVDKIyhdSHGD3OnFmYQ9KkszQS5D FtimUa/AqjJCufQ== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 Add support for sunxi-ng read-only dividers. This will be useful to the a733 oscillator detection logic. Reviewed-by: Chen-Yu Tsai Signed-off-by: Jerome Brunet --- drivers/clk/sunxi-ng/ccu_div.c | 31 +++++++++++++++++++++++++++++-- drivers/clk/sunxi-ng/ccu_div.h | 1 + drivers/clk/sunxi-ng/ccu_mux.c | 2 +- drivers/clk/sunxi-ng/ccu_mux.h | 4 ++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu_div.c b/drivers/clk/sunxi-ng/ccu_div.c index 62d680ccb524..c385e0160f13 100644 --- a/drivers/clk/sunxi-ng/ccu_div.c +++ b/drivers/clk/sunxi-ng/ccu_div.c @@ -20,8 +20,22 @@ static int ccu_div_determine_rate_helper(struct ccu_mux_= internal *mux, if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) req->rate *=3D cd->fixed_post_div; =20 - ret =3D divider_determine_rate(&cd->common.hw, req, cd->div.table, - cd->div.width, cd->div.flags); + if (cd->div.flags & CLK_DIVIDER_READ_ONLY) { + unsigned long val; + u32 reg; + + reg =3D readl(cd->common.base + cd->common.reg); + val =3D reg >> cd->div.shift; + val &=3D (1 << cd->div.width) - 1; + + ret =3D divider_ro_determine_rate(&cd->common.hw, req, cd->div.table, + cd->div.width, cd->div.flags, val); + + } else { + ret =3D divider_determine_rate(&cd->common.hw, req, cd->div.table, + cd->div.width, cd->div.flags); + } + if (ret) return ret; =20 @@ -143,3 +157,16 @@ const struct clk_ops ccu_div_ops =3D { .set_rate =3D ccu_div_set_rate, }; EXPORT_SYMBOL_NS_GPL(ccu_div_ops, "SUNXI_CCU"); + +const struct clk_ops ccu_rodiv_ops =3D { + .disable =3D ccu_div_disable, + .enable =3D ccu_div_enable, + .is_enabled =3D ccu_div_is_enabled, + + .get_parent =3D ccu_div_get_parent, + .set_parent =3D ccu_div_set_parent, + + .determine_rate =3D ccu_div_determine_rate, + .recalc_rate =3D ccu_div_recalc_rate, +}; +EXPORT_SYMBOL_NS_GPL(ccu_rodiv_ops, "SUNXI_CCU"); diff --git a/drivers/clk/sunxi-ng/ccu_div.h b/drivers/clk/sunxi-ng/ccu_div.h index be00b3277e97..a30a92780a05 100644 --- a/drivers/clk/sunxi-ng/ccu_div.h +++ b/drivers/clk/sunxi-ng/ccu_div.h @@ -300,5 +300,6 @@ static inline struct ccu_div *hw_to_ccu_div(struct clk_= hw *hw) } =20 extern const struct clk_ops ccu_div_ops; +extern const struct clk_ops ccu_rodiv_ops; =20 #endif /* _CCU_DIV_H_ */ diff --git a/drivers/clk/sunxi-ng/ccu_mux.c b/drivers/clk/sunxi-ng/ccu_mux.c index 4503c9780c39..12bfc99c9172 100644 --- a/drivers/clk/sunxi-ng/ccu_mux.c +++ b/drivers/clk/sunxi-ng/ccu_mux.c @@ -67,7 +67,7 @@ unsigned long ccu_mux_helper_apply_prediv(struct ccu_comm= on *common, return parent_rate / ccu_mux_get_prediv(common, cm, parent_index); } =20 -static unsigned long ccu_mux_helper_unapply_prediv(struct ccu_common *comm= on, +unsigned long ccu_mux_helper_unapply_prediv(struct ccu_common *common, struct ccu_mux_internal *cm, int parent_index, unsigned long parent_rate) diff --git a/drivers/clk/sunxi-ng/ccu_mux.h b/drivers/clk/sunxi-ng/ccu_mux.h index c94a4bde5d01..272a2c36a8f2 100644 --- a/drivers/clk/sunxi-ng/ccu_mux.h +++ b/drivers/clk/sunxi-ng/ccu_mux.h @@ -134,6 +134,10 @@ unsigned long ccu_mux_helper_apply_prediv(struct ccu_c= ommon *common, struct ccu_mux_internal *cm, int parent_index, unsigned long parent_rate); +unsigned long ccu_mux_helper_unapply_prediv(struct ccu_common *common, + struct ccu_mux_internal *cm, + int parent_index, + unsigned long parent_rate); int ccu_mux_helper_determine_rate(struct ccu_common *common, struct ccu_mux_internal *cm, struct clk_rate_request *req, --=20 2.47.3 From nobody Fri Jul 24 22:54:57 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.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 1FAA5370D56 for ; Wed, 22 Jul 2026 14:48:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784731723; cv=none; b=E/UGQreKXd2bLqkTd/866TUMhVLtwXO8l1yCZdkysj+1KA4Gu00mBkFKgUeQgNXCTQUWBWO2A5gWmelDYp50DnC6ocsHQvc+O9s03xObzGp0bz4tQztVxQJ2vAArFMysgRQl1fy6m3RI0YJtDjWM3Nk3SvWmE5sixyq2lUOpiK8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784731723; c=relaxed/simple; bh=JBCNsbbmpvOyQAHYAiNtZ0xGeCHrftQkcKapQT6A/2Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZK7TmLuZe2x4/R6T9sQmhb3EHpKeopOGe6b+iNnxfl+dNr3mHytwTIe50TAbaGJczZULcD+TQpIm8uqtzxYnKdAcXLMf8+0KN6oVUmw2BsoOZmBTOOXOBiks+mQaY7xnDZTL5/OPJAph8xByIlbu8cLg1BTnelOSIjrfvQ/bihI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b=SjpQceZ7; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b="SjpQceZ7" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4954d29264cso24959645e9.2 for ; Wed, 22 Jul 2026 07:48:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1784731719; x=1785336519; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ZjvDxGaz/+Ym5ockvfd8pkGSRzvwp3SWGNBrqT7Ifz0=; b=SjpQceZ77mgZf+ejLYOtfS3kyxV78fhR9fUTNotj3zVN2NjCdsYbs/9B13KI479LnN 4ILw49t2TzeUmSEz4ZS03sZfL6lGDEGFB1owYtBIOl/4+v5knTB9k125kTS8ee0NwT3g TUrXBQxRGdHBgxCCEc4QmosW/icbrmyLGqNgyVAxFV1URWszO8fE+0POB356XYqxuF5N I/hypn0uK7AojtYOfY1BYoBMPy1gMW7OolO4WU151nruWmUNNM1i692NHoV9U44JdxtH jhLsGx0NxUB71XhNhpAL2d5Dv+f/UJseqJ/tXxzu8P+zS0QfdqR4j11+1CtFtXbS1SW3 tXJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784731719; x=1785336519; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ZjvDxGaz/+Ym5ockvfd8pkGSRzvwp3SWGNBrqT7Ifz0=; b=szUMCFVG7ab0W6SgJZbncx+Tv/FlwtDMcxZdtAWwuRMRsgqgo1to6e4FqCtVbvpU5Y vehLu90dc2mvl7q68aW3R6UKsVLMyE06vfkba1hX8aaFdBZcQAhp43Qv4R22BznXjz5t btolmk4XXQm5eBY8FfQn69LlLdUYoASjqIUSR/d0bzMEezWQIQWomm026QiWs0jUFYOV p0l1V8hY3yR3wArn2McazXwoZFwUFI/oZKzMSk6qfHjJvVUWyACd6un+EYYE54/s0kry zBSUGgq0dV66cMBHizSrn1nCDMkWo5KhNvTQKBhDNh8trb7QUVSWmHmnphVUKk2gs1xJ OZUA== X-Forwarded-Encrypted: i=1; AHgh+Rpn/Mgf88taNiZCSBlkN6eaFaV3yc0iaBCJeidXeroETFc4h4TCOpwkZowOJNidNHJq6fjF0z+qK7E9a7I=@vger.kernel.org X-Gm-Message-State: AOJu0Yzx0n7BQDFxS3uxkLDjS1djBY4NoQHgWmahoHaRJWSTWnn6bfze WcQ56CFZef4c9VaeCr6Y0XTR4flGHFowolqoQBP38mH1WoY1IgkFtTFwfVTAwe7SxW8= X-Gm-Gg: AR+sD13VqOhk8XXKZStRootZnuGlbwscHEJEgkDtR6z3vGvknQmHRVwCW2L+kCdPNu8 V7iu861gYG9ZZ2Q3p/b4199vOdljNiTQRvdLP0bbG8Cw7Jca0AePMVav805nMYIXVQC2Dweug4u LtJf/B6z6UgkM6HGVD5YcNruYNjy7HAIPeKAkJF0kUc57ZiBZfog4FUJVy5YczqNhxKallZWREm Quee1Lvs6q+6twzHyjSi4kz+/YUsGfVuQb/uVdms7hDbhiYk6IhD5wjg/fI7R97Dhgv/lmmAZ7V 5X8xz6IYzeQPZi9dqTamgAfsjTLxp1/Xcl26hRRfjHYTD8h5c3GHpcw74f8f2p5da3lUdYYeiOs CjMVBEmHo+erYRA8lc+RNKJUL86EHyB7CdiccNI/qMUZ2M1vHS5AGNvW3M5PUCzRS0qAfaKwhV7 D8 X-Received: by 2002:a05:600c:21da:b0:495:3e08:ad24 with SMTP id 5b1f17b1804b1-4954a51b524mr185452815e9.33.1784731719082; Wed, 22 Jul 2026 07:48:39 -0700 (PDT) Received: from localhost ([2a01:e0a:3c5:5fb1:a589:14b5:ba97:3626]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-495653c8760sm139823645e9.14.2026.07.22.07.48.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 07:48:38 -0700 (PDT) From: Jerome Brunet Date: Wed, 22 Jul 2026 16:48:21 +0200 Subject: [PATCH v6 3/4] clk: sunxi-ng: sun6i-rtc: split main oscillator div and gate Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260722-a733-rtc-v6-3-631cca28cc9a@baylibre.com> References: <20260722-a733-rtc-v6-0-631cca28cc9a@baylibre.com> In-Reply-To: <20260722-a733-rtc-v6-0-631cca28cc9a@baylibre.com> To: Junhui Liu , Alexandre Belloni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Michael Turquette , Stephen Boyd , Maxime Ripard Cc: linux-rtc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Jerome Brunet X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2641; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=JBCNsbbmpvOyQAHYAiNtZ0xGeCHrftQkcKapQT6A/2Y=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBqYNg8H3wMJRC9rFCS2UiRPc6rFEZssU9BeWOM0 IVN3Kqk3IiJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCamDYPAAKCRDm/A8cN/La hc8MEACv28/V5ccSfgbQoFHihys/2ZxbPthoGPKW5mVRQE+g/Oz7L+SPyZBpuZsgvMxiFpLUVvA CMHDqN+3rNai6f57DbVEELC4zx/u8jRB/ZDoZGgGjMhxTdFO/+39KxpLcInS1n0/GBFkHAIMMkQ 9tFoo//qXYoacnTNxLHTLjJFoBa/cWgZEEwBNjHIWJMcHsc44QIDzsKQgN7CRprENs5KmmZOR1f JumgVe1k3xqIx+7pUpwA7oGi3Ymem4bw5zu1GJxb79mx4FRqYPlL24E9tbIbmneKe0luhQcRDvX 1kv3GBIbMrOmq0zqvRfU2eAqlGtUQQ9AwEzmV9DbQ0Xn0HVlQMx7L1MbL/UQaQ2vDjoQdHU59s5 YpSj8Hp7HN70Wxg3Fw7TuvO3oz9pjNkUCovCEVrKVDCJO9G04cicBnu6uYfnxMdOxKE0qQC7gnU 1lsHznk3OGrrxG53Mf+1RRTTANJROZmFPa9khK5gJS4MHaEbaw5koNWbVqwvTzri0cYFUx3lkOJ 2fjEsIKt5TELlf1UJSijMcDTZWxdb5xoM23tOtNfHcSYmRYeS6/nePsghZsDNWakso8H5e3G8KE uqaFMLAGUbZOStYwp+kEz+oBYtn3TfZl+lzv2oggN/1xZylqxWUMsuj7yX9TpXLSu/g+nmNSN5r qc+du/pM9mHomng== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 On the a733 the "osc24M-32k" clock has the same gate bits as the previously supported SoC but a different divider implementation. Instead of a fixed 750 divider, the divider is selected based on the rate of the oscillator. It can be seen as a simple read-only divider. On the A733 the gate and the divider are on different register which is not supported by sunxi combined clocks. These element will be split on the A733. Split them for the older SoC as well to keep on sharing the gate definition. Reviewed-by: Chen-Yu Tsai Signed-off-by: Jerome Brunet --- drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 20 +++++++++++--------- drivers/clk/sunxi-ng/ccu-sun6i-rtc.h | 3 ++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c b/drivers/clk/sunxi-ng/cc= u-sun6i-rtc.c index b24c8b196e66..25dd87e78eb7 100644 --- a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c +++ b/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c @@ -218,17 +218,18 @@ static const struct clk_parent_data osc24M[] =3D { { .fw_name =3D "hosc", .name =3D "osc24M" } }; =20 -static struct ccu_gate osc24M_32k_clk =3D { - .enable =3D BIT(16), - .common =3D { - .reg =3D LOSC_OUT_GATING_REG, - .prediv =3D 750, - .features =3D CCU_FEATURE_ALL_PREDIV, - .hw.init =3D CLK_HW_INIT_PARENTS_DATA("osc24M-32k", osc24M, - &ccu_gate_ops, 0), - }, +static struct clk_fixed_factor osc24M_32k_div_clk =3D { + .mult =3D 1, + .div =3D 750, + .hw.init =3D CLK_HW_INIT_PARENTS_DATA("osc24M-32k-div", + osc24M, + &clk_fixed_factor_ops, + 0), }; =20 +static SUNXI_CCU_GATE_HW(osc24M_32k_clk, "osc24M-32k", &osc24M_32k_div_clk= .hw, + LOSC_OUT_GATING_REG, BIT(16), 0); + static const struct clk_hw *rtc_32k_parents[] =3D { &osc32k_clk.common.hw, &osc24M_32k_clk.common.hw @@ -286,6 +287,7 @@ static struct clk_hw_onecell_data sun6i_rtc_ccu_hw_clks= =3D { [CLK_EXT_OSC32K_GATE] =3D &ext_osc32k_gate_clk.common.hw, [CLK_OSC24M_32K] =3D &osc24M_32k_clk.common.hw, [CLK_RTC_32K] =3D &rtc_32k_clk.common.hw, + [CLK_OSC24M_32K_DIV] =3D &osc24M_32k_div_clk.hw, }, }; =20 diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.h b/drivers/clk/sunxi-ng/cc= u-sun6i-rtc.h index 9ae821fc2599..ab7b92b47f59 100644 --- a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.h +++ b/drivers/clk/sunxi-ng/ccu-sun6i-rtc.h @@ -9,7 +9,8 @@ #define CLK_EXT_OSC32K_GATE 4 #define CLK_OSC24M_32K 5 #define CLK_RTC_32K 6 +#define CLK_OSC24M_32K_DIV 7 =20 -#define CLK_NUMBER (CLK_RTC_32K + 1) +#define CLK_NUMBER (CLK_OSC24M_32K_DIV + 1) =20 #endif /* _CCU_SUN6I_RTC_H */ --=20 2.47.3 From nobody Fri Jul 24 22:54:57 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 37EC2374730 for ; Wed, 22 Jul 2026 14:48:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784731726; cv=none; b=nNFiNSl4rozGI2OyL8/h/5+leA0qrAHV70jjA22Z5+0IJ5LtaZNbuYZ/1FtJeNPNRdxCfBxCr/ZUM+LsljZgu+526gmkmKhvNAZxcfGy4SWMI+WPjGKhfnkwMnaZDC086iWJS/DL4yoSobPIn212bSSid/Xz77qPCdvmrdmPdgU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784731726; c=relaxed/simple; bh=ZxtEY0Po9koFr9SK/FxQWL9lGl95syc2R11eiKw1uuc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=D0we7vog8/AsIjaOJg6ewcDSIV5x3YhZ5Oo8WDGXKqdkxaNjomGoHQ4a7QBvfhsWYseDJDURU0DaJvoKs/TFA2W/8ePlTwgPkPfVOdCmP3jniTaFGDuM46IhO8UEQjKTNOBOzvME16MLZF+M8m0W2qE95VrBSvZpDOvVb9ntlX8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b=FPTkANFO; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b="FPTkANFO" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-495590ba856so32686275e9.2 for ; Wed, 22 Jul 2026 07:48:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1784731721; x=1785336521; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Hhejqqk/YejfwiP6Ga/bYKh4OsY78ne2Bp/UpWOM4CI=; b=FPTkANFOBeLiFXVc8UTV1XXUOZYkY4O2A0QNDxPAAZIfQR7kjaLfzBAqxeFSPregt0 Np5qMw08dQBZ+mEdL7aocAvZzj54JFYocrnEe5r/uIJsklaG+j8UR7QMiKyWSP+sbB/S aCXLpJbPsqQh7XQRqUsgWe+EtZsXZxqzHAY0t1XOh49AX4Q6QDf+W24w+fOjm+b6+nhu Nx0TK71jbnIfUeBx64JYL998xhhacdeqkdrdewraNr2T4A9f5c7howrb/vbGjK0s0/Ie OQ+1P5piSA8C+2Ksb0QIFfzrmMwtEI5LiR0OStbA9bNo5m2/s/1Itct22EWps3hhPfPg A5bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784731721; x=1785336521; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Hhejqqk/YejfwiP6Ga/bYKh4OsY78ne2Bp/UpWOM4CI=; b=mmiPfeh0RVWhEUllrkSqElABKABS/meiGyNZoTWfxeV/hPabSIDt6bEsFCBwZ2Ql8z lzyhKFyP/tVTa2FyuE8aRQihIXLaQKoPqou3Bzl3f5wT8YzMzzBk6ywp4qGt9tAN/F8D UuB5eE/b4MoVnIN3Vd8OdSRi52W/6bm0vZaDWdSTmMHijZOXhxsu80FikTgAUTEbIk0Y pvmHMr71cSjTDjFI/FEeKs5GZivRwR2FUs6jzGMOIh0IqlWxaAe6YBGQ5rO9Tsrs3S1q t4uO6vLzH1mIOpvZHtfeSk939c83jZ7hlDPu9dD8DDz3c6XeUZf6cTER4EIr0MBGt710 1HQQ== X-Forwarded-Encrypted: i=1; AHgh+RqBrc33z2uU9q9OmaIDVoNyvr5vVZiAOsKLVWxbsVFuBspDyIY44duIhmUnt7WWdByKNS/23CBYCyRXhrY=@vger.kernel.org X-Gm-Message-State: AOJu0YzMlLvFExPXhL0HvV03p5MwHahmga627+lv6X2tZ7gkLtzGVsXo vfgxHppsbX6jELx9EDY65KsUE3qQkm2D7f7fAGiBmkDtXfPJgM+dIkgrUWIdcyPvDfI= X-Gm-Gg: AR+sD13xIQWIOp8grV/UE/CV6MnhGyF30xYFmsiU0PNsgsrHqWkeGKsROWCl24Pjznv OeWyjtOPdVprEy2U5vy6ZIoeH8H2RBtF8x6y679F6QoczlYeUiQqNnfK6SKEaC4Ng07aEhsBmTu CKblt5+Zh8ydCM+UDaCy4T9Ngckd6npdzbzoPs0K7pPHClcInUCSDmAZis81Q1Q7IVKtJRaa0kF bql3rMlyU8XPS+IJSYD0sSCijFN6KnNjzTqQsougdyWLUNAsl+R7wmwAGCW0Cmwax3ttdd84+Up y65qC/PaFgDLeUj6IL0yuttmRsZGBXFl2Wkro5K2Hskrx7zi0Wwb+WWiXj/arPvZSxRZ+ABowXT 3Bvl9H9yLTsUW0SHedCYVB5B9O8+onk5tzs5dlrWwzvqKYqj/I3p4f7jV1LaY9fkJFz87nflaJd QI5QXC89pB1CY= X-Received: by 2002:a05:600c:6812:b0:495:5eca:f9b3 with SMTP id 5b1f17b1804b1-4955ecafb22mr143440495e9.26.1784731721250; Wed, 22 Jul 2026 07:48:41 -0700 (PDT) Received: from localhost ([2a01:e0a:3c5:5fb1:a589:14b5:ba97:3626]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4956a967289sm74385765e9.11.2026.07.22.07.48.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 07:48:40 -0700 (PDT) From: Jerome Brunet Date: Wed, 22 Jul 2026 16:48:22 +0200 Subject: [PATCH v6 4/4] clk: sunxi-ng: sun6i-rtc: add a733 support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260722-a733-rtc-v6-4-631cca28cc9a@baylibre.com> References: <20260722-a733-rtc-v6-0-631cca28cc9a@baylibre.com> In-Reply-To: <20260722-a733-rtc-v6-0-631cca28cc9a@baylibre.com> To: Junhui Liu , Alexandre Belloni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Michael Turquette , Stephen Boyd , Maxime Ripard Cc: linux-rtc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Jerome Brunet X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6141; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=ZxtEY0Po9koFr9SK/FxQWL9lGl95syc2R11eiKw1uuc=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBqYNg9Waoqq3MZucyId8+AceAKymJeYhrmU7zeh UM3CcGJcruJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCamDYPQAKCRDm/A8cN/La hdXlD/4vKyXXdx7/8DZD/I9kaq/bXldqR1mvVfp2cVuODKb5kp6rUP+iGMydJY02oSkCtZ0TCzR IexfQP9NvFfsSX4jAHij7HCz6EvwMpjEp4aZU8qgfEv3EDrHgwS3ZxQZLKNd1TQvg4Dl6LCtC+R ISb2VLG9rOlHeIsWKbztvAm6s9AX2vPSmGjqk0hAqOi9918vSYEwS7XaXRp+i6KuHoHUwwyUscD dKdapZ4DKGJd44UCXdeye3ofL2zS+pzWoFn70xXpRuqmpDqpF/5wlB/qMFp8kLNSTMQ51RNa68n IAqSF84X0bxNafRprdjF6scSibQmhYDpOCTEL5NU+fGy7ZTzLXOM1zDQh07ML8eHUpeJHZju824 uLIcmnjvvg3jd53mKyRqJ9QyqWPGj1KSutZyrAeazTYBl/ypfz2FfoyTt2x7FQiwXyYYqW2SS2n sCTqusUmjRby13s6/Y0pKVu0EnLis3KyYuQxFsUMmY76PHxSbJIWnV4YMtGEAvX2pLeWrTSEZU9 QmwPYoRP9r8u+jGZyOLzQSWP9Fc59nsc9U4dgIlIy4alSQ4zFNACCmZVZka6DuIy+/3+17dwPD6 jBCxzFi/7xyaH1ZvT+iz5HS7hZLgcgvw7if5KmS4qwopsQmUZ+sfu9Biaj595FVP8AjMKKyk/nV kF4eMhJhI0Z1DUw== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 Add support for the sun60i a733 CCU RTC. Compared to the a523, this SoC has a different input oscillator divider which auto-detects the oscillator rate and select a divider to provide a fixed 32768Hz clock. It also provides several phy reference clocks with dedicated clock gates. Reviewed-by: Chen-Yu Tsai Signed-off-by: Jerome Brunet --- drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 77 ++++++++++++++++++++++++++++++++= ++-- drivers/clk/sunxi-ng/ccu-sun6i-rtc.h | 2 +- 2 files changed, 75 insertions(+), 4 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c b/drivers/clk/sunxi-ng/cc= u-sun6i-rtc.c index 25dd87e78eb7..98ae10307f43 100644 --- a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c +++ b/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c @@ -44,9 +44,15 @@ #define DCXO_CTRL_REG 0x160 #define DCXO_CTRL_CLK16M_RC_EN BIT(0) =20 +#define DCXO_GATING_REG 0x16c + +#define CLK_NUMBER_NO_GATES (CLK_OSC24M_32K_DIV + 1) + struct sun6i_rtc_match_data { bool have_ext_osc32k : 1; bool have_iosc_calibration : 1; + bool have_dcxo_status : 1; + bool have_phy_ref_gates : 1; bool rtc_32k_single_parent : 1; const struct clk_parent_data *osc32k_fanout_parents; u8 osc32k_fanout_nparents; @@ -213,7 +219,12 @@ static struct ccu_mux osc32k_clk =3D { }, }; =20 -/* This falls back to the global name for fwnodes without a named referenc= e. */ +/* + * This falls back to the global name for fwnodes without a named referenc= e. + * NOTE: osc24M name might be misleading the oscillator could also be a 26= MHz + * or a 19.2MHz one starting with the a733. The original name is kept anyw= ay + * in case anything is relying on it. + */ static const struct clk_parent_data osc24M[] =3D { { .fw_name =3D "hosc", .name =3D "osc24M" } }; @@ -227,8 +238,30 @@ static struct clk_fixed_factor osc24M_32k_div_clk =3D { 0), }; =20 -static SUNXI_CCU_GATE_HW(osc24M_32k_clk, "osc24M-32k", &osc24M_32k_div_clk= .hw, - LOSC_OUT_GATING_REG, BIT(16), 0); +static struct clk_div_table osc24M_32k_div_a733_table[] =3D { + { .val =3D 0, .div =3D 732 }, + { .val =3D 1, .div =3D 586 }, + { .val =3D 2, .div =3D 793 }, + { .val =3D 3, .div =3D 732 }, + { /* Sentinel */ }, +}; + +static struct ccu_div osc24M_32k_div_a733_clk =3D { + .enable =3D BIT(1), + .div =3D _SUNXI_CCU_DIV_TABLE_FLAGS(14, 2, + osc24M_32k_div_a733_table, + CLK_DIVIDER_READ_ONLY), + .common =3D { + .reg =3D DCXO_CTRL_REG, + .hw.init =3D CLK_HW_INIT_PARENTS_DATA("osc24M-32k-div", + osc24M, + &ccu_rodiv_ops, + 0), + }, +}; + +static SUNXI_CCU_GATE(osc24M_32k_clk, "osc24M-32k", "osc24M-32k-div", + LOSC_OUT_GATING_REG, BIT(16), 0); =20 static const struct clk_hw *rtc_32k_parents[] =3D { &osc32k_clk.common.hw, @@ -267,6 +300,15 @@ static struct ccu_mux osc32k_fanout_clk =3D { }, }; =20 +static SUNXI_CCU_GATE_FW(hosc_serdes1_clk, "hosc-serdes1", "hosc", + DCXO_GATING_REG, BIT(5), 0); +static SUNXI_CCU_GATE_FW(hosc_serdes0_clk, "hosc-serdes0", "hosc", + DCXO_GATING_REG, BIT(4), 0); +static SUNXI_CCU_GATE_FW(hosc_hdmi_clk, "hosc-hdmi", "hosc", + DCXO_GATING_REG, BIT(1), 0); +static SUNXI_CCU_GATE_FW(hosc_ufs_clk, "hosc-ufs", "hosc", + DCXO_GATING_REG, BIT(0), 0); + static struct ccu_common *sun6i_rtc_ccu_clks[] =3D { &iosc_clk, &iosc_32k_clk, @@ -275,6 +317,11 @@ static struct ccu_common *sun6i_rtc_ccu_clks[] =3D { &osc24M_32k_clk.common, &rtc_32k_clk.common, &osc32k_fanout_clk.common, + &osc24M_32k_div_a733_clk.common, + &hosc_serdes1_clk.common, + &hosc_serdes0_clk.common, + &hosc_hdmi_clk.common, + &hosc_ufs_clk.common, }; =20 static struct clk_hw_onecell_data sun6i_rtc_ccu_hw_clks =3D { @@ -288,6 +335,10 @@ static struct clk_hw_onecell_data sun6i_rtc_ccu_hw_clk= s =3D { [CLK_OSC24M_32K] =3D &osc24M_32k_clk.common.hw, [CLK_RTC_32K] =3D &rtc_32k_clk.common.hw, [CLK_OSC24M_32K_DIV] =3D &osc24M_32k_div_clk.hw, + [CLK_HOSC_UFS] =3D &hosc_ufs_clk.common.hw, + [CLK_HOSC_HDMI] =3D &hosc_hdmi_clk.common.hw, + [CLK_HOSC_SERDES0] =3D &hosc_serdes0_clk.common.hw, + [CLK_HOSC_SERDES1] =3D &hosc_serdes1_clk.common.hw, }, }; =20 @@ -330,6 +381,15 @@ static const struct sun6i_rtc_match_data sun55i_a523_r= tc_ccu_data =3D { .osc32k_fanout_nparents =3D ARRAY_SIZE(sun50i_r329_osc32k_fanout_parents), }; =20 +static const struct sun6i_rtc_match_data sun60i_a733_rtc_ccu_data =3D { + .have_ext_osc32k =3D true, + .have_iosc_calibration =3D true, + .have_dcxo_status =3D true, + .have_phy_ref_gates =3D true, + .osc32k_fanout_parents =3D sun50i_r329_osc32k_fanout_parents, + .osc32k_fanout_nparents =3D ARRAY_SIZE(sun50i_r329_osc32k_fanout_parents), +}; + static const struct of_device_id sun6i_rtc_ccu_match[] =3D { { .compatible =3D "allwinner,sun50i-h616-rtc", @@ -343,6 +403,10 @@ static const struct of_device_id sun6i_rtc_ccu_match[]= =3D { .compatible =3D "allwinner,sun55i-a523-rtc", .data =3D &sun55i_a523_rtc_ccu_data, }, + { + .compatible =3D "allwinner,sun60i-a733-rtc", + .data =3D &sun60i_a733_rtc_ccu_data, + }, {}, }; MODULE_DEVICE_TABLE(of, sun6i_rtc_ccu_match); @@ -375,6 +439,13 @@ int sun6i_rtc_ccu_probe(struct device *dev, void __iom= em *reg) osc32k_fanout_init_data.parent_data =3D data->osc32k_fanout_parents; osc32k_fanout_init_data.num_parents =3D data->osc32k_fanout_nparents; =20 + if (data->have_dcxo_status) + sun6i_rtc_ccu_hw_clks.hws[CLK_OSC24M_32K_DIV] =3D + &osc24M_32k_div_a733_clk.common.hw; + + if (!data->have_phy_ref_gates) + sun6i_rtc_ccu_hw_clks.num =3D CLK_NUMBER_NO_GATES; + return devm_sunxi_ccu_probe(dev, reg, &sun6i_rtc_ccu_desc); } =20 diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.h b/drivers/clk/sunxi-ng/cc= u-sun6i-rtc.h index ab7b92b47f59..4f4f4cb00f1d 100644 --- a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.h +++ b/drivers/clk/sunxi-ng/ccu-sun6i-rtc.h @@ -11,6 +11,6 @@ #define CLK_RTC_32K 6 #define CLK_OSC24M_32K_DIV 7 =20 -#define CLK_NUMBER (CLK_OSC24M_32K_DIV + 1) +#define CLK_NUMBER (CLK_HOSC_SERDES1 + 1) =20 #endif /* _CCU_SUN6I_RTC_H */ --=20 2.47.3