From nobody Sat Jul 25 04:54:45 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 AFCBF418A38 for ; Fri, 17 Jul 2026 15:25:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784301914; cv=none; b=OevYTuWqfZrQIz2xI3V4VjIdwu+erimMeucXNmf3j1dreI48ME8kn3Ced/ZyPX8m9foN99CAVTBWR8cda5EeXCjFN0MwFHIpm/z/0sdoImQpREu/Su32ImCmFl78UAeWmKXSv53AGuqGsZEMDytyQOoSGmKOv1oeRDTU+DKziUc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784301914; c=relaxed/simple; bh=Q2OlWVW2kYyvJ4ck9C1HFEDQQxKC0CvD5EifWl3TI8I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LJ7VXD4+yQ2vcuKVdx1DgSJ8LKK7VBivh5PkUBehvk7ODowEcFHyBzDuJogV8vjhfnSkMmaBy1ZCumEKxor1sFPGwan7KyGIVIBjOU89GByaZOiL4fbc+Y7nAOu0zDrjnR861t9SZg9ClR24CC4Js5XUW4lOaXoQX8FVg/T55Bk= 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=pt4jX6MG; arc=none smtp.client-ip=209.85.221.50 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="pt4jX6MG" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-47f59f25ec4so627713f8f.2 for ; Fri, 17 Jul 2026 08:25:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1784301909; x=1784906709; 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=AxMkzfTuRNAdYSsxT6YGmZwozzVZOIfJAMqM6UE3eUk=; b=pt4jX6MG8WgKHvEXfyqwKzgyqnClMuQKTkZW2yL8eZGTnVvsXYt6rdTRrTRL6T6OOs iAjNLv8GanrpjJNzvVxoBFofpeDJOhnXeXWmNL7VVshMurdXgiyBRdiff5/3cqkZJMVz CxKhxVUULspR59+Tcf+yWVtZrbVXIpppWVm+LkwpU8wbjM3qWg4cG+LdHLS0rj6Lyr4B M5FeyD/Sl8WAbZFg4NxMGB7pNtfPi4W2GMcXjimDbC0KfadAb5Hsgq63jXBD67/jblwA hS28D/Y3ncUnDk8rkkiRxi82m6HYrREFkqNGCyDA5+QHsFyyIzv2p9hf7VtrzIvB3UhV 5kIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784301909; x=1784906709; 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=AxMkzfTuRNAdYSsxT6YGmZwozzVZOIfJAMqM6UE3eUk=; b=maHKqgFPmH/vWFEv+7GSE/UhzDpwmznPHiU6wVO4n1P/PVoIXPtXAjS4Awa087u52k rMF74cdZKsxEzybZ8rJqO4a2rFGDZpvmh2kF7MoN18Osh2yWIgxS1R2/VSW6X+nDd0Nf iliyrwdq5AAnuZgOwle0qz9aCXztZCfJiW3VhViHMZICTl8C/rL30T5w0Gajf4S5hsXf mEONiuuyobpaX1Nj6thirPho2YGEbFesBZoHab6Tao1wn6fP0V42m2g7gfI2Ys7HA5fX gj2XYhgfDMjgYQK/AeHC211DWQWIx50vD2Rz6oo3RJDtB0+av20L0ZlT4Cnb5D5vbwvw XPxg== X-Forwarded-Encrypted: i=1; AHgh+Rpv1W+aOZohLzSELD+EpEqIg6DPGYQpf1eUvIUadqmOGiyiVfbir7XO4C9m2/3p1s5JFIDQZ9f5IcLyHzE=@vger.kernel.org X-Gm-Message-State: AOJu0YwQOXBUjBqYl9gH+zGVTd2m3UqY9BBrlSlwbcJRPmZ/dVGPsuYp EzAFAleA6Dt0p64fVvoBV3P072w2s2V6oTG5AO1ROyUmK9G26QfSVCPEzhIuUqTrcIA= X-Gm-Gg: AfdE7cnypAjP949Whx95h7Y0Gs37YwQOz6boKJaCQZSiVFWERDmHml3V+1V/b6dA60y 3Il0oRwDaJAi8ok6hx7DK2iBBI01TFFHeLxkSRe8I7C0eDmQ/p8HKhm4yX/7pBU0/Gs09SQHO3S eQUCFr+fN0Ds61QliLPllp1pIRWl7AnFjLljCb1fFFK5EpqMomtP5xQluYTpCA/3JXk0oSZbGqQ xrne1bsAaAYinTnZo96a1shEUsUhkXyN2ePrHdPi7EbAHdRi/acz5zH2ugaKMW4K6MvQ9uGoncd QKmOUGelG2HTlRiJyIG6SVU1Q9Q3r5AxkOt6T0WILOu4j/hC16dOdzhWboSaVf/9HChOgxy6049 902TVIHxujxd6byR7YnTQM4ysYEq1i+IFW9flDauj159vnY2npsmOtW6t2OAFVV2KWOyKyFQ+XM JB X-Received: by 2002:a05:6000:43cc:10b0:47f:673c:42cc with SMTP id ffacd0b85a97d-47f673c431amr1140040f8f.27.1784301909172; Fri, 17 Jul 2026 08:25:09 -0700 (PDT) Received: from localhost ([2a01:e0a:3c5:5fb1:8e22:8a15:f33f:dc60]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-47f63e49500sm4498478f8f.2.2026.07.17.08.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 08:25:08 -0700 (PDT) From: Jerome Brunet Date: Fri, 17 Jul 2026 17:24:51 +0200 Subject: [PATCH v5 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: <20260717-a733-rtc-v5-1-3874cc26abf7@baylibre.com> References: <20260717-a733-rtc-v5-0-3874cc26abf7@baylibre.com> In-Reply-To: <20260717-a733-rtc-v5-0-3874cc26abf7@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=4247; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=Q2OlWVW2kYyvJ4ck9C1HFEDQQxKC0CvD5EifWl3TI8I=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBqWklMaJ5nQazW/CvZptCQwUdPHVXC+ogZgt8OQ joxR/uuJXOJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCalpJTAAKCRDm/A8cN/La hV5oD/9dlma9q3nUzL/D6R2ufySBp084Z81IAZgEr67zxgghSUFHEQ9bzvO/nc0VNLsU3M9IUh0 4ZA/rOJ3oCRhfPhPx7moFNZeGHRDeIX+EPwqmmPwmtx52xUfjIJ4690J+m605pZvymTm4cY+jQd gceE0frmEqbyIEfu0gnDV6rq30G/RTR+dZot1y/hJxUzXOF3mNCRkPZdgYONXejfRwg1DLjVCU7 WUgNfNii1Yhug11rQimQoyZX6GR+Av38uXBpHyyk9dNFu8zWx/yGNFjy0rS3pbeFeMPwCCzNjkS FWZAKrctBq+rV8TfjjkG04l6ebo7GcRWVZMhH1v05Tuh+cUwq2uVbWNBUr9tZZLeVJZo8MpEJoV KIf+AJ7R0G6KntjDdI2EzYv3iPhI/2tzidO4bq1N9GsO8WAruQVxS1ZvOKihwxHemA/GVFvRiJb 3rOXM/36rTpfpNONyHxYOnBTosYJsRivG2X/FLEudqtCWgI6a6Lr0WJqcwR4MQWfXnyavgRajQV xDGUQzByRORUMmKK4g6jdmMG6An0wMtis3VF55mqs4XTb+ba4VcS4MqoM7pW9+No+NZpARzRsi6 tJJGUPS3YNZFzaML2l4TXz/DDS3jsefb24rDGoAo++hpgYLMai4uKq0qeYNncyB06BqezdA3bS/ kGIQCWWwp+aAl5w== 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 Reviewed-by: Chen-Yu Tsai --- drivers/clk/sunxi-ng/ccu_mux.c | 56 ++++++++++++++++++++------------------= ---- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu_mux.c b/drivers/clk/sunxi-ng/ccu_mux.c index 09230728c400..75ec3457324c 100644 --- a/drivers/clk/sunxi-ng/ccu_mux.c +++ b/drivers/clk/sunxi-ng/ccu_mux.c @@ -92,66 +92,64 @@ 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 treat the predivider as a postdivider. + * It stays mathematically correct and ensure 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 mechnanism. 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 Sat Jul 25 04:54:45 2026 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.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 E966242E004 for ; Fri, 17 Jul 2026 15:25:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784301920; cv=none; b=UPGXQ9+vb5FVU7Iyo0Q1LN+liiZZksL408zaZxR89vVUoEKrJqqW9N9K3izW6DTkv0Mm4Vx0C6DJ3zdG1Su/oBShgvORWJIQYGOLHPVxIiAbzU1tL27liG6PZxaQpbnOZEkCTTsgkOB/QgMamaknfAghYAY44JJTzGOHJDZzNZM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784301920; c=relaxed/simple; bh=6iIA0WTn0kaWrc1sr3Kek/HJCNSFbL8qhQ+00WGwRBM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eedui3HfPDgA8g4FybwXTTqy4suiPRDCYWcTq0ldj6kVY6Z3tsD37T6csewQUxpq2Ux9QW3fHOjmKYfBfxZPiQcgL40AUynK8AUQu1LMqeabCKU+t5cUBLkBHodShYkwKvZklgGgAfLqyvJBK1WxjPLM+1/mGK/lB2PzM6DRq9Q= 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=RvSHDH2b; arc=none smtp.client-ip=209.85.221.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="RvSHDH2b" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-47df440fcd5so4351226f8f.3 for ; Fri, 17 Jul 2026 08:25:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1784301913; x=1784906713; 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=3wgMh3yFxpSQUpY7Ql+FMu1f7EBXpSaKGdxPimN78QQ=; b=RvSHDH2byUamNAM18X5VAOPjKzpBKo/GEVf2bl1Xkna1njhFb6r/quhPdMCZJLXp6j 5Z0t9irlPwJi8wdl36ZK35rvH9ar2339LQUcuU2/0aoMgduZOvSGzHGff8EKWTxhjmGI PAvvYbyiyOQd0XRUId/ZoF4kAVVYRNlxil5BRHVBiUkgfHiRo42DNjVZt4PYyzS7M72q kiwkuZozwismyIdQvjybdZEiRdcELuPq20j9qyqSRH5YoO2y6sbamG9YzKX1InjKFsa/ A1+7+b0CkVI+hFwXD1sp6CBbOf2gQBv0LP1wQKkkOL8wXo3UT1Ykf59NUX3CB6D0jbl2 AkQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784301913; x=1784906713; 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=3wgMh3yFxpSQUpY7Ql+FMu1f7EBXpSaKGdxPimN78QQ=; b=DmeVoYLu4OltwqNX7CjtKq/agsRNS39nwkOA6dmQF6sKHeeIrYz0crZqPSKdPtd+Xe RmRAoQYeoP0UEEH2tkrWGRSM6A0HhZb1+ApNJ7o11SlU1QoWXS3q48jyNSsRK7hTpi3p fmiuzgZ8cpcewF9smN2Eq8V3LZv+DTnjk9TzX0g/hUAq3KUTlsLAkMK+n+MJduq8wUZ/ lovngLIyD8w7OcOcJ/U7ou3l5fDa3AU2KX8kDmrQxnA2lRQq1hUR4Czns/yywUdspLHF mZf91Mg6e1K2/QIeSh0hR7w0nsx3S7V9NPbRCdgkz8AApOjXKmS2pliEfGVUkrYLhY9j 6voA== X-Forwarded-Encrypted: i=1; AHgh+RqY/VG9mOfQbRsSZMIFbyGhmcbH1Whtk+lFH9x8YzIfo1W93VuX/gcS1Ob1MZRRA5P2zZstm/N17T25IQE=@vger.kernel.org X-Gm-Message-State: AOJu0YyMslMCTcw4RIe33MuZbcyVOw57O+QkftI8ASMOgEOUG188LvfI 5Wd90l1aeOsXtw5PrbeLRvovqsvSxjy3dd9kMEt99j/JZen/5Oq/6Ikn9V9RigsD80w= X-Gm-Gg: AfdE7ckgHK7KWmG/9a/bL4v+YGD88pk+fXyNceCPi0mBkJnzOXcrIuM5uNCEBLZaWPM HULNr+LNpKZkN1hwp/qzgxRVKtjJtz0dU0+DdERpo6Y/BvE5wMKss0OdjCozJd0jYNVlEFfSeE/ k05u62zw4M2G0L9SXQHXzrJ8geeAOtGevJscreaLIV1TLO6aNlYXVdrDAIrb8r0jYH9aqtt8b0a axmb1to5K+r/eLR0VG9cKHwOZ0X2Wis+MOKNCaoGj6LYuHhiKl6nJihspYHE59okO9vlwhIPNvD esMxX9bH4BNA9P7SVwVoDVq3KEuOa3q2ZbHSY0lCunAWYJzLltK+64BvWkbkevTtNSIxTN9ht/F mnSPlSMb/lp+jSmyZXUKhYqZBkIvw/Zwx1vkBhnrgH+uZJ7gRREv7zlVlbth1G6djttYVBV+M7b LE X-Received: by 2002:a05:6000:1882:b0:47f:5e89:aa2 with SMTP id ffacd0b85a97d-47f62338d7dmr3838108f8f.51.1784301912982; Fri, 17 Jul 2026 08:25:12 -0700 (PDT) Received: from localhost ([2a01:e0a:3c5:5fb1:8e22:8a15:f33f:dc60]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-47f63e496ffsm4808169f8f.3.2026.07.17.08.25.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 08:25:10 -0700 (PDT) From: Jerome Brunet Date: Fri, 17 Jul 2026 17:24:52 +0200 Subject: [PATCH v5 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: <20260717-a733-rtc-v5-2-3874cc26abf7@baylibre.com> References: <20260717-a733-rtc-v5-0-3874cc26abf7@baylibre.com> In-Reply-To: <20260717-a733-rtc-v5-0-3874cc26abf7@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=3662; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=6iIA0WTn0kaWrc1sr3Kek/HJCNSFbL8qhQ+00WGwRBM=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBqWklNbHRTWu+C+fdTSwA8INAva/DV0orsBtig+ o8EwQ1NvI+JAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCalpJTQAKCRDm/A8cN/La hW7YEACFQgs0gDea4IfvKYhJ1hf7FoiOwHPm4tFr2Kwikrbz/InoPDNLw3I8YPgnEXuT3MNUJkH GBywQ3xsx/f8qCtV+nYNELgy1zlm//70eoe8gk0W+O451Acv6ztXiiJBIiNtXC/ArXnUCDJgufo oTrn3eKvmlbAdSPUIEEFYPTZR3Q6n0pYAQckIZ13fZyNfW5OlC6D3CI+VSPXFzbTzSqtrwmblyT YgEY0TTGhgHKQ4na+E1rTJ5p+pkf56LIvv08Clf5/Bl4POHDz07KMmLbU3DVJ7yHf4vKwHceHjn leMhf6SJUEsENp3XIcvo/YDVtAKE8lR0rWfbFAXSI1MpAayGdzgUMKpVIltkpQj8tnznHShrt2J ptBOUAvE9+GtFSZW0MvpklDn/fOjMniZ7FadxnUqGJj++GbKm0tVAxCQOu1VmcIQmLl6wt1hamc aZz9AHLU2VzQUR9ckVe46iUIHMlkdi6SS0vGPVA5XxCmNO7R2+TWaiVgNygmw4+WkZMs6LUikCc 0UeuiZIwItjIPQj7IUGtJIT2RPyBQN6ISzoFwf5GKUhOQxRC0FE5CLbXMxhnpPXU0NQbvVKOLoQ vK0biMw+yjrTxywcCSFehJLjFnr6n8+/pFldsgGJEpsDIJf2EtXoXHL0H3Z6pD/4b5WpNPDYCrs PPg2Ow8dyy3i3bQ== 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 | 30 ++++++++++++++++++++++++++++-- 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, 34 insertions(+), 3 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu_div.c b/drivers/clk/sunxi-ng/ccu_div.c index 62d680ccb524..93cb4cb93abe 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,15 @@ 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, + + .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 75ec3457324c..905570375711 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 Sat Jul 25 04:54:45 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 9E3A5328B61 for ; Fri, 17 Jul 2026 15:25:17 +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=1784301921; cv=none; b=m4ghJz/5nmhxP2aO4o4RWp4blW7FUbx8pgCnNOwYPAfk09jBVb86gyctbiG0emsJy+GIK66FaOhCm3fxeg19nRzeNBx0TvksepSIjPWZ1N/zxi4Y2JxpV5B0kgwLSBbP61P44TuU15400GUWja9IVlUNZtktQISVgslm9qkyYyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784301921; c=relaxed/simple; bh=JBCNsbbmpvOyQAHYAiNtZ0xGeCHrftQkcKapQT6A/2Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KbQS7DmdKvJPYIjiKjPJpV0MbEfu0l/l/kuTFxCCUd9J3OyZYjQPY5VAF34sWoe78L6qxM6DyfKsxK63SwTfhPshUYPBErxubQEUy3zL8lOwdnj3kWJWyY32yePCl9nnvjNQ7xXBSeHMr8EgvjRNtNFgVIoTNoFnSYVCe/47x2E= 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=ZI8Xz8pD; 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="ZI8Xz8pD" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-4799b3f7c83so5714462f8f.2 for ; Fri, 17 Jul 2026 08:25:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1784301915; x=1784906715; 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=ZI8Xz8pD0an2hMPOpmJnezf2BVCtomQGKnHbgVCoBL+pOoBZXXQBeiDq7x5S0gSpmK 8ycywpyuRueymEurtYh61Jraf9B0NEG0Lim0Tx++iE13S6HekXNQ8Gkw+UHHABI9rpZl Vbqx2uOb00yKzDVMLAz/SP03O3JFy8dy6pGWP/WxrPXmOiJPiGE4vTLCcrXE/TcmTEHE nbnI8pyH335bbh9EghyhSJvFDj1nVqADP6rBfJBvyogZpIlbRNgDkcT01zXR26sPVmuZ cEm91DqhUq1QWE95IC39vXVTnBNVxQZ/bNHZhnCquIYbj7VLsJOuSAPhaPLLDHFjGBJe xrHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784301915; x=1784906715; 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=li6/SMoIFv03n0RWKove87t3WulC/uGAItcNyKmeJoZHZeMU6wezzi8K72fLgEhb25 oC1D/bFRY+O15hMpb6eK158ZePWXemzqU2WdJPO3WWcijRkW32UK7VP6y7DLEpfI6fGk +UPWtA8D/gW6sOO41dVqYx0qbznlWFSXjpQxCyW6+YWzrcH6bERuW6SijeP/+RZXCWvA ecVm7FNCleeCyywBuflAaCHLDpm5TqUHsA42adLQUTfXV80Zg+LPuNmAVMTJN1Lekwjw 2WZV9iFG9HqH157eQwFlYIH9pq4ACu+gdEbEnIV6+oNcS3FKrXsdP5ySHL5tfW2Esz25 nA6w== X-Forwarded-Encrypted: i=1; AHgh+Roov8xSKpoOrZc6u/Xsf/OYG4qOkZ1W+tyHx2rcbxzPsPePokRee185IPmHu54ap8xdxFf7fmm4KwV8YU8=@vger.kernel.org X-Gm-Message-State: AOJu0YwjjZmlEbIVy9qnhl12ujn488CA/8eCOaskt8N8BwrAy0F3sSnK 4Hfq4WGpSrmBf+yMiN+jw434WGyT3a8EqWQuJH5wX1N3wJ9b/qJArpIpP+xSf8AL2QE= X-Gm-Gg: AfdE7cm5mZyFOoqqJu9gwlxXRh1oS0Jqz6JmFd+vWYynBFAHurONOF7FcQjYbev2R0b kFe3Ny6LyAVBKc3at7L46XVYJACPL1LG3LgA6cGxnTAiZLcZNcLUpmSAPOxC99yOD6tKFMMbhnA BvY9PnkLG765LStD+iA58AWV5yKHNZ0d2QoUBPDkfEV+SfpaMBblYzl6wVVcjVytJdjyEin/jyq rq+0uE/ZA5dwkHXCv5u8NZJGK8EAXgUZW+fzgeQK8RN+Pq9dcFtPv579av455UK93hlaeKCxodU HAOUC31Enc2jB6ZpRXOh8QlHvsRnYnzcgZrecHfzqVDGqnVh9iThRtnCXuCuEwIeThpWIhCpgDh vEEXu3PmA7uEDnN+GAXf7HmqiM/+XtmraqEGtJjzxiJJqMH39rgnwlNTOWYxM2kZCNcWn2AH3e0 SD X-Received: by 2002:a05:6000:2303:b0:47f:5291:fae with SMTP id ffacd0b85a97d-47f6233bec9mr4275709f8f.51.1784301915393; Fri, 17 Jul 2026 08:25:15 -0700 (PDT) Received: from localhost ([2a01:e0a:3c5:5fb1:8e22:8a15:f33f:dc60]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-47f63eeece9sm4855342f8f.37.2026.07.17.08.25.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 08:25:14 -0700 (PDT) From: Jerome Brunet Date: Fri, 17 Jul 2026 17:24:53 +0200 Subject: [PATCH v5 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: <20260717-a733-rtc-v5-3-3874cc26abf7@baylibre.com> References: <20260717-a733-rtc-v5-0-3874cc26abf7@baylibre.com> In-Reply-To: <20260717-a733-rtc-v5-0-3874cc26abf7@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/ZANAwAKAeb8Dxw38tqFAcsmYgBqWklOUZjr7y2WuxQfFPTyrAQ07oi9okv23RLOm R3EG8Nkk0uJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCalpJTgAKCRDm/A8cN/La hUtND/9gWGLRZiqsVGnuaARlPg06QXVbvSuUCKTaYB/564ePeUYI4DDA+VB8WQUs3Xzugzqx8lz BmHR+EzBj7XpYIQn1l9k8CVOdXwacybzEXuVQL4WMybY6xZmOK9fLWqxRNm3ZGibQGnTJQn+STw raYcri4xgBN8Zt3zWOI5b4Hm8q0WzyPgNUXNT0Q8VX+nj6LcytzgJR00sWp7+n5NnwW01GSNOKu RkKwbV4xg40BFjFVzNNtCkrPjcbpQWPQS5GxJxV5N8Wgapti+PfXYEtclRZWOw+V84Xsia8XeFD VjT8RBfBgHpRn/uXvSBS1tjEEPOGrmxP8bfiJAlE3MspvkXW2L4bqcZjdzlGE6osA6U8hd7masY Xar19j0B5DJBxAV9ZRzIjACTONt0mhLTVOMyB5QVKDiP9Zo0l6xrilWDlU9r0iyh1fM98++/xJf F5yUqxAPpO7ps5aMIus5NNGcrnlCEFEOha7FY35C9xjlkxljBtdm2kJZoYcui/FQpM970e3oqN9 9KqzpEDlBNJ4GT1/Vz9uNxZiDvLAA7Rz1BTicn564gdqKl5Wr5btdDaRsZWGgLyrDaXY7/h8TaS ylrEyos2SqTVybeivbBU0lfvXuIdOCf4LQPCq2Tx4arDtEJZa/kVzNC2D7OqOZsxyqssY0O6KVz XEmvMHzAcf9nc1w== 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 Sat Jul 25 04:54:45 2026 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (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 17E0542E8F0 for ; Fri, 17 Jul 2026 15:25:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784301926; cv=none; b=CuvIOhrqrQQ6GWzQQQeTRdnVWljkvje7ATQVnservsH+fNSq2tJfzrvOV+tJHcFjWhDRNLnXmmbakWSbruJAKFptazd1w8Io69wQzEkuxXUHJbTbuDXrEkR8eByaky5qtHdfzCDZ6qb97OHagExRUuhk+mIFHC7NwqF9d5EAxNo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784301926; c=relaxed/simple; bh=ZxtEY0Po9koFr9SK/FxQWL9lGl95syc2R11eiKw1uuc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=usOtLSXNZFSKHsomKW3X0tpBvCWjXs7xYOT7SQ+HDUrlJxuJtD9xyYZ/Zmo6M72XUMkHJdHFD7m1d7W9HsRO9rw4gGBp9JFyn+oXoEJdrMQQ/y6Bu5rX9z0Ono+3vzaKWFxxgfB0NB5/zrR5OLIu8uQGgoSmu0bypIUzf8ievO0= 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=l8euRs2j; arc=none smtp.client-ip=209.85.221.44 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="l8euRs2j" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-47d6c634f45so4521620f8f.3 for ; Fri, 17 Jul 2026 08:25:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1784301917; x=1784906717; 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=l8euRs2jivY/jDXbwNz559W1BhOxWQKDQCXokfL5KZmhDr2kvcvFRrF/dNN8r/xYPM lwPLLlqoidAf0p87o4nlEy1d4sF9eN00coEbinR2dSExPMqKFHJwg9d1Edx8vv4uuAyE 2COHWwZpntkulL6SHVSSdpJIh8kqtS/LlWM8hkuKGe5pTTXY58MjeLhoNElmArsOsPNz YXX24ewp16FfH6IKoEvLS5FFU1WPR+kZZIvq4mFEM3WhyPkl7+pnCmAudiI6HQzaMepf 9dyEysbuVEdMtxEJ5eC3cWbJ9+0hwzshiOHsorAVu2EvR1fLn7Qccz/Wc/X/lTuv5taM DyWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784301917; x=1784906717; 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=fpmyWE3X60wWc/WG7BlW95m1yr02OxC/CLodQrKNocbbuisbGRsZMdK6l/m0i2Zw1t gg+8zkXDdr/NSkDJyIplZiDv6SGQB64lgWZQh8YRhb7ZKbtgjXiVIeChuqJ0Z1wOBQvm P71PrLA2vjmjCbh6wyZjgaZbLVfn8PJt51wsxEyztwLwz3R05rH5WnXYQVFuo/Y2Txvl M9+98K4SsJ6VJl8UkmAbcUoHSp/nrG8lHvShvFuwCwlZCJEY2+gOzcQK7yjReQBJuDwL nZoqO2VSSadO+Xj+lXfKgFFlpnrjEpknA/dUtCmK56Sg4ek43WbnyT4TZJQkji7N3hhQ hNvg== X-Forwarded-Encrypted: i=1; AHgh+RrIRgAH/Df9Fx3V7yHVJPSbTi2QLECCS1Bqncl2rHNw0OUmykxgqAE1jLkpW9x1YBB6BAMsh1mPatiARhk=@vger.kernel.org X-Gm-Message-State: AOJu0Yyoezch9PkDFuayAsX2bwWCQRaA4wh9bFB1dQTwpU8KyVbgn+dw 59z8ALFpsvLojGqFdtWoiHZJLdy0AVziq9b9GjcQkQeTi0M9Og8tMmtm89FtBJ8hHdI= X-Gm-Gg: AfdE7ckr74G0rd5PIG9z4T5nnQktdsgOQ/s/81CAkxE/r5Z6nL67h1uT1jlBqVxW35e E7ZgaHWHZIjBQHqOLxYAA3+DURKq3rUY7yE62cnKAoFRiVrWO2bFxprTl+HSF9WX3X4feFc4WwS +4Qi8k93Q/l6icarybvTBLo6H8HH6EocnDt6nch+iJGLVSOBK4ELg5WcEfhiMLp554LycAHe2D6 MQUo3ckZSsdbcZXwrJJJVgxNI2C/aX49Bnph5lMJNo9Bc/kKKhM/aUngP1Slhc3Ymx2oi0LfR+4 zXJDuWYcmu3MdA/38C/1gVATpR3bVcxrHxkD+d/n3Hisy+lQkL41kcwgDj2M9bEHYF0A/sQ2Vn3 gk+MtJjwwuo0qN00pmOCSwy2SZl2qhFgMrTsTZgHDJrmSI9ZRts8BnbvvgtXg0RTQkYzQGLssQj Dm X-Received: by 2002:a5d:588d:0:b0:478:1a24:912d with SMTP id ffacd0b85a97d-47f6233d29fmr4655239f8f.57.1784301917524; Fri, 17 Jul 2026 08:25:17 -0700 (PDT) Received: from localhost ([2a01:e0a:3c5:5fb1:8e22:8a15:f33f:dc60]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-47f63e65644sm4211074f8f.16.2026.07.17.08.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 08:25:16 -0700 (PDT) From: Jerome Brunet Date: Fri, 17 Jul 2026 17:24:54 +0200 Subject: [PATCH v5 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: <20260717-a733-rtc-v5-4-3874cc26abf7@baylibre.com> References: <20260717-a733-rtc-v5-0-3874cc26abf7@baylibre.com> In-Reply-To: <20260717-a733-rtc-v5-0-3874cc26abf7@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/ZANAwAKAeb8Dxw38tqFAcsmYgBqWklPYwYKyBd3CWGNFpqn23Bc7xuBlJIXjflvZ 24rfeAeKe6JAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCalpJTwAKCRDm/A8cN/La hSo8D/9xWGGY9LduPCVJf9vAXrffcvr112BqVG32PNVM3ZPUe5YFuym+2ounbNhggeMbn4430J7 H3PrWERDgUypq91xeuRG10p3Pjixg7eudX9T1WtCuOFP+9f+4rSXQ3Fo1jP4hUXOXzn5ejskxbo e64YLBQU6HkFCGMpFoJz/Uq/0XCpLgHIpyBKGOk5mNA/7j3xnWRJEbBvS8op0eWxRqGoY16r2Xe u5X3PASiKN+EyUwPCu8QP/mcCzkDGM86U9MSY39YYdY7zmXvc2yvQpZfZCUv/raVorhNPEyO0Dt QuMoPAyXVkDF3ugO5DNbZjHJ95Mu6GxR02RKwbCAHxiYEluh8FyENX6ilRPjhHG3QkMvyIfPoca NXEv4Ux4WOcZKsF5Xba541HHJU5Z/KGNuJxXr8lKMPgCICkdzk4xQvxvday4VzUgTeBUAeU/vhg l/dt0giaCDfVz606oy/zsem00a+NvCOQdcMh7FIjUA1wdqp/Jk1LPlPJt+GgGGZY641PVY3Q3/Y 3VW7jIvd7wIEjr35JGieN2kuij0FgBdBlbf2q6B3TQ++KtlpXKdFACv5iT4ZCSPWDMszWKplci+ edy8plNwJe4VN+q99eza06QDTpPot4etr/I37u4GZrgqwahUUiSD8UNOJmrvRoZt59zLIAgiw8A jMrXPitf3To3d5g== 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