From patchwork Fri Dec 20 10:25:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 13916568 X-Patchwork-Delegate: neil.armstrong@linaro.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 881A1E77188 for ; Fri, 20 Dec 2024 11:12:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cHmruRXbBd1M7MQs3vPgnCMn1kCojPDfpx/h6wcmqUM=; b=1esnc4kQjpA84X 6bueF1DKMU7VPVBP6lYI4XydfiYoXBjVB1lY84yHBj9oGOvhJD168hQKZgwZ46m9CodrPqiQjoday sU4B+N4da55DL/mtt0SJRLzpFOcFHIO2RCqah2u592vVCgp/D9Rl3DR98aJSnXmCBBWS/DwWNVIfJ 54rrRI88LDCcW27qmfP7wcdwsnLmHdxrJm8DfTc8Ds8X0rRZYgC9KlLMA2f59cGaEnLnLvqGeN5lK 0nSvU9OGccYTYR8XA3d2fmunVjSQYLByn6nRXRCTPlrYMgZ4shft+I+u2i30uqPbXWQUikc2ACELB qkGkYN+YPMgVuNWDplig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tOavb-00000004g4D-22Bb; Fri, 20 Dec 2024 11:12:19 +0000 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tOaCb-00000004aHj-0twd for linux-amlogic@lists.infradead.org; Fri, 20 Dec 2024 10:25:51 +0000 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4361f65ca01so16746595e9.1 for ; Fri, 20 Dec 2024 02:25:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1734690347; x=1735295147; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=oB5LnFpvLXXFDiGc0aX0SzrXmBsCEEf198BzA0TMrQM=; b=BK00IX91zfcLepjDabUqeem9tqSZ6sYY+XUpqT4ahxyfy4mX/6tMn/H5kDITGBWiOR o39TDqJVj83LMqIleOe0DmhkUtSEFRhW2JgFzxpuF/rPzYrzGm5+ojiS7r+oP/6xxz74 wQqANkQZazfSKAex12hqzqAKv+IXVpnLXJoUYHri1Khy7CAfZr+RNk5FonRwPHRECwsm vduOSLPisSodPbHMrSrJo0lvSyJeJyItbY/Js5tEPdlouaNByT23FpNP/Bo7iPsZdJd7 7BwyW4nAgrwqdJHiRrCECFC+G5a+GWbxlfGYq0QE7bXar3BHfX6Sxd3IlmLK7uFIe07K bAhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734690347; x=1735295147; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oB5LnFpvLXXFDiGc0aX0SzrXmBsCEEf198BzA0TMrQM=; b=QiqYBlkB97UnDHQ5JMojx3tLB6Hx/yeBJFPaoz00//oBBYrQZghT7SSiSDpnlD8/cX q9K5lpCvz1QGJ277L6ESRkSoAsxAgFVqRKPw0K0nlpYKPyJmwz/CZOk15BUec8SH91qE 47mK7Sew0dxQRoapC6bf19Qq0633Z3/C38w9TZ4zLY1KQcaqO8UTvS/ppjrbo9CsFPVx 8IiV5syppKy4hnjQ2tnzcpfBZk1GXonHxJ22kq65PKxkblOD4uc886C2l5NvLCqLC8B4 hD11pt9H1wX/sagrG/Hxj0uVtCATT/ttJbMt9+DZnBqnF0g/JWkjwOZFxKZ7WsmI7YeQ SXdw== X-Gm-Message-State: AOJu0Yza5lxQx41QFtdBaIlVlnCmc+69JvMeY+bJQuoqlf0O8OmEXjg1 KAcb/p3DowEpcbf7RrHavU3PCuC2EuWAgT+YqdMr9g33n8QfVI2n6Lq2yfMCN+Q= X-Gm-Gg: ASbGncuqhTc8PY8wzPDA630PrJXnBI/KDSAaQopzT5ftj2+ydTzCTAUXdEqXGJDxGf/ CS/7BLG6GTTgIC21u0qJlHpikVpV8aa9XtUub4tVKyGoJSnm2zFKGq1GrlAv4iRWgkPMY7Gjyq5 2a5uWCdXpd8tYmrSlUGeMYw5GaIbUPWdbKinKI8G03Err29FFIZs15yT95uOZVhc5WcKfsd+lK4 DWcfMoLMVgcK1fwBz/xX8pc5ZdZwIUQ0mYsIEnbDQMZPNntF6Aay9Wcigt776tleThamLY= X-Google-Smtp-Source: AGHT+IExJcj7R6Fj2hV3B78SaEFs9sQdEDmlwmWEUeExDxy3OaKLM9OJhZYp5CvU0W0mDQYhl3y1rQ== X-Received: by 2002:a05:6000:144b:b0:385:efc7:932d with SMTP id ffacd0b85a97d-38a223ffb44mr2188704f8f.46.1734690347320; Fri, 20 Dec 2024 02:25:47 -0800 (PST) Received: from toaster.baylibre.com ([2a01:e0a:3c5:5fb1:c000:46df:1e3e:983f]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-38a1c89e2b0sm3752071f8f.82.2024.12.20.02.25.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2024 02:25:46 -0800 (PST) From: Jerome Brunet Date: Fri, 20 Dec 2024 11:25:36 +0100 Subject: [PATCH 1/2] clk: amlogic: gxbb: drop incorrect flag on 32k clock MIME-Version: 1.0 Message-Id: <20241220-amlogic-clk-gxbb-32k-fixes-v1-1-baca56ecf2db@baylibre.com> References: <20241220-amlogic-clk-gxbb-32k-fixes-v1-0-baca56ecf2db@baylibre.com> In-Reply-To: <20241220-amlogic-clk-gxbb-32k-fixes-v1-0-baca56ecf2db@baylibre.com> To: Neil Armstrong , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl Cc: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jerome Brunet X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1072; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=iUeX9wdAi43FUJsW47StJGB1Hl6nYX69ImjfhxaI5e0=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBnZUYnKbGrf4tfndrwYB812r9wmrvzkUkC69KFa clu7oxTHt2JAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCZ2VGJwAKCRDm/A8cN/La hVIlEACtOj35dKmDN1tybjFaCIu4xF8Khx/59xxrLcZ72LPQZmEwhe9n44Z+Zgbcz21Qjv6RYce 1FlxtnC9JYdihIzlyM2MHbCXqMyrSfUBYRafhADTATpnFTdI5k5HzWwBYg7QXJ4qIJe/CSB/+3H g9Nse6kuiK1pK7zjP3GoXu5Ww7XMuB86jyt/dS7dGcOOv3sQ3qLfM3Lq3PqhHbRZ9GTKg/JFn5X UkstNlz4uaIFR3gjt0lapkfGSslp8gaL/OoSoHmHAf6RGQz+RMN76q8LKuWTBAbxLsz76I/tF1E DE2FDf06nUWYCp1HHMizs0lGKg5uf+smor4HJRWkP3VStyA3Da75n/U34n3yPrx8iL/2x6sJshS TLuAcyzPcG6gk+Udj2fv2CfJc3zkvAR0eaKcvsNP3Kzz4t1s26Etw8O9jqBXevyn/VAxQUBui5u yEMccu9HVuQf17KUlkYQrY6F7E+2I/phtVcZwk03sOv7Hp18WoTccErkfBYolxHmgkxpttLiPe4 DDAaOxi48lCpeN9m9Bmzv7XZ5p0093WdMBpysY0lKXzBiGHEoKtTcqtDnt5bv3FQ1MmfkaVAODO S+mv26036FYLE0/zjNRwCwYc6IQIs6utX2rVxiJ1liYEeMeQ0BTq3CT3biKOcazUJ/PcOaB0p6Y dYS29VoIqx86J7w== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241220_022549_269544_314DB788 X-CRM114-Status: GOOD ( 11.56 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org gxbb_32k_clk_div sets CLK_DIVIDER_ROUND_CLOSEST in the init_data flag which is incorrect. This is field is not where the divider flags belong. Thankfully, CLK_DIVIDER_ROUND_CLOSEST maps to bit 4 which is an unused clock flag, so there is no unintended consequence to this error. Effectively, the clock has been used without CLK_DIVIDER_ROUND_CLOSEST so far, so just drop it. Fixes: 14c735c8e308 ("clk: meson-gxbb: Add EE 32K Clock for CEC") Signed-off-by: Jerome Brunet Reviewed-by: Neil Armstrong --- drivers/clk/meson/gxbb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 262c318edbd512239b79e5ad26643ae6c7b0173b..62494cf06e7d775bdb18b2242c3d45bf246bdd0e 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -1306,7 +1306,7 @@ static struct clk_regmap gxbb_32k_clk_div = { &gxbb_32k_clk_sel.hw }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT | CLK_DIVIDER_ROUND_CLOSEST, + .flags = CLK_SET_RATE_PARENT, }, }; From patchwork Fri Dec 20 10:25:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 13916569 X-Patchwork-Delegate: neil.armstrong@linaro.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7F734E7718C for ; Fri, 20 Dec 2024 11:12:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HF7GLJZ8tF7EYEjsH6OckcZswIT/9DkHSp8MdieyWtQ=; b=OR/J243v/eVfng YVyH6ZiZFRQlEP8BPgkC0r26bDdUKDSkp50Ia9m88ckrptt3Mubaor9fqagMzkRhagAZxPGhkjs9h 9UbM+gC2nDHO47axZIW2EZivIJJ02bG5uopNPRc1L9vUnq25c+oKElDrmmN0v4PyboxMB8wOxNR2W YYOQODYbyYXacl5oCK4l7k7Cntn5wK1jS75UmCk1R4Z5Z2PA/gpMo+KAtT9M3oI1dCqluOYCKO6RB hr7YBoLnaOQoaQvOtttoqv3Cp4Oe0yv+doPtVlm+lIzULZe3hxZQ0rROaY1NLg7YAhFUx7IchIUuw OtuTFOleAn8BU/YzhnaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tOavc-00000004g5P-21uY; Fri, 20 Dec 2024 11:12:20 +0000 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tOaCc-00000004aIO-1dbY for linux-amlogic@lists.infradead.org; Fri, 20 Dec 2024 10:25:51 +0000 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-434b3e32e9dso18822805e9.2 for ; Fri, 20 Dec 2024 02:25:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1734690349; x=1735295149; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tW+UtVxBTIei8COHkRsDNzEfLN3gFvFH+d/3sNPCK9c=; b=zhVj26d37F3YREMrYBFXjqNea4unzhAOZ/S8WkJmhmnoHTOS9K3WDgy9PWv4+NExEw uOyZQZmrQ1kC6gXj3qBEpBoXr05E3ZPVHjlgKyvYeP/kq5nOiqgrtCxQ4rnvFBgoMnZz Ggvrh7AXqtt5cOASJ/1EZyGlGm3G7x0J7a2QyP35O4eM49BbWAEulUUsCBaViO+8wOfH SwCAD8ukgzvi3wTkB9QomZwbvA5rzNvfrONIWyH+M8OudikBxLD15WDxV1FCAGlUxucS T57bIDFA2AUlzp2ihTGNL0pEwp+1iZKWwflN4LZJ1/1zqxHsNAQM1Vvvi+PsYNqU3zU8 Wmrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734690349; x=1735295149; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tW+UtVxBTIei8COHkRsDNzEfLN3gFvFH+d/3sNPCK9c=; b=P2lFXe981hUwef498P0W+NdYR2W2MmLbwUmZjS6a0gaaOu64PojKu3USWlRJiJ5dMC WOEZwHFJ3fWTNQh7Gs0phkzQmVpJNzSpFgorTkoUl/BX+K5NxVrLzGMErVAx9Z8bBERK uU5v3J/eOp6doWSw2+HGyuglAKQX1L/zFWIB9GEtqP5OvtmjqXkgSiQGwuojWo626MYg ClVrARE1nkc9PQoVqc3MiOaSCXZ4udt1TmRnAhdN+f977nyFBEzU0OD2+pKJ5X4TJcUt DMrNf+++XtuGAsBdSuAVkAEf4XKu92PdbCjj2pvtcmjUgyyB7OGGtdh9aQ5tl4tC/H/U c0Qg== X-Gm-Message-State: AOJu0Yz5coXSwfp0mXA7QooWHn4zdqB3RnnILvKsEMDup5c72fRgP1oO TTbgJlKGRbVuu08ui7B0GMaqciTxlLQ4Jvyr5vPAxQzKf3WDhNpkXcnFh11PZes= X-Gm-Gg: ASbGncukjuVN0Tz7u66oQPx1piZyNWdcvDwPDSHZaFao1rUdNFbLE7Zgxhpa4kOaSPI L7nY5rknq26N1d/vvC/Jlj70KPbLgLH7Q/qYwVI+ftQs2x8Rsu1Dt53EFUD5ZJqr+QmvvR7MzZt dCTUWwg35rdSenltKu1vgMRX7fV1/+TcIVrgLmZlzMYKeCtyg6K6JpyyAMEpfcxvruWpoj2rRxS q2lTn4D01IsDfkMm22Ee20osJ+WZfm58dE+jrZnZCdez8DEl/PtUSjLHGvaCcT+sJbcLVg= X-Google-Smtp-Source: AGHT+IHNHc8Exy8WvIm7auYFTudT6vC7NcI8W+IOnuoZKBIcVv9XpVb+nroKXjYEhD1E+1wL9opJ5Q== X-Received: by 2002:a5d:5e09:0:b0:385:e3c1:50d5 with SMTP id ffacd0b85a97d-38a223fc3d0mr2630378f8f.48.1734690348184; Fri, 20 Dec 2024 02:25:48 -0800 (PST) Received: from toaster.baylibre.com ([2a01:e0a:3c5:5fb1:c000:46df:1e3e:983f]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-38a1c89e2b0sm3752071f8f.82.2024.12.20.02.25.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2024 02:25:47 -0800 (PST) From: Jerome Brunet Date: Fri, 20 Dec 2024 11:25:37 +0100 Subject: [PATCH 2/2] clk: amlogic: gxbb: drop non existing 32k clock parent MIME-Version: 1.0 Message-Id: <20241220-amlogic-clk-gxbb-32k-fixes-v1-2-baca56ecf2db@baylibre.com> References: <20241220-amlogic-clk-gxbb-32k-fixes-v1-0-baca56ecf2db@baylibre.com> In-Reply-To: <20241220-amlogic-clk-gxbb-32k-fixes-v1-0-baca56ecf2db@baylibre.com> To: Neil Armstrong , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl Cc: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jerome Brunet X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1817; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=pjbHjEyvAPQg8xcHFTDpuSFttT8eA1MfiRhiLNmBp+M=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBnZUYoWqwNK0m6lGtma3zHCdJr4WdFQbjpstf6M NT7ktMFNKWJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCZ2VGKAAKCRDm/A8cN/La hUVUD/4isn20TrQjB+fmFaSq1xSlWcpPgFcHvJuxR95RlrgousUI48fqZvhvGIL+njYoZeObqbb SHLywnkm04pRxi4Y6Ay7mNTjQ0aTdyjJg6Tdpsg30z8O0r2ANI3lG3E5n4EU0+kwbu+3ySasFeS x2naisfqrFsb+X44XwyxFIdilsExWUgnDkwa0viM1GxuIGl7HBucFz/e2kAYnu0az5DR1jXv5hL Ljxi+HzcSctiJAovQ3jrrBw/p2jvbzqZGAP2lRDLrKrG3iPjYvtA0e8xAXNZnORmu3flR33KBUM aEdKXbCKEhfG7aQq5UJU+pfshiqKbwv770v113dN91SdJdjnUMLc13BPSzN/NZ4+E/6+7JDGQNl BbqFB1HspcnKRuAbIzv0HYkqU1CbqQu+WT3FMRGDsoCm9UDQQ27CAXnHPZY9xj3YpfAHlWZmS48 e1SZC86Q5+dwGao5a4GYy0wOUxgTnxrsKrp8OC8YctSks534oWxskMdGKz1ydCCIXV4S1I+9l6/ ej0gPrZ3TX+n5lUhg9FCmp/XObOqxAB4GTkwDWmwf/aJ+Jx7DcKneiGbcpYKUz7PGoJd7CTD1bI yFdTGbhMH7IDVtc4B8ietbyCfJi/5NLkaRHN1IxVnFevjHQeP3k7n/fv9cd/ZImVHGbHB7Y1DRJ kGHADgAUvWjNxoA== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241220_022550_450969_E1586F93 X-CRM114-Status: GOOD ( 13.09 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org The 32k clock reference a parent 'cts_slow_oscin' with a fixme note saying that this clock should be provided by AO controller. The HW probably has this clock but it does not exist at the moment in any controller implementation. Furthermore, referencing clock by the global name should be avoided whenever possible. There is no reason to keep this hack around, at least for now. Fixes: 14c735c8e308 ("clk: meson-gxbb: Add EE 32K Clock for CEC") Signed-off-by: Jerome Brunet Reviewed-by: Neil Armstrong --- drivers/clk/meson/gxbb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 62494cf06e7d775bdb18b2242c3d45bf246bdd0e..66f299f6fef1442ead5e978c1d3750b55b800c2e 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -1266,14 +1266,13 @@ static struct clk_regmap gxbb_cts_i958 = { }, }; +/* + * This table skips a clock named 'cts_slow_oscin' in the documentation + * This clock does not exist yet in this controller or the AO one + */ +static u32 gxbb_32k_clk_parents_val_table[] = { 0, 2, 3 }; static const struct clk_parent_data gxbb_32k_clk_parent_data[] = { { .fw_name = "xtal", }, - /* - * FIXME: This clock is provided by the ao clock controller but the - * clock is not yet part of the binding of this controller, so string - * name must be use to set this parent. - */ - { .name = "cts_slow_oscin", .index = -1 }, { .hw = &gxbb_fclk_div3.hw }, { .hw = &gxbb_fclk_div5.hw }, }; @@ -1283,6 +1282,7 @@ static struct clk_regmap gxbb_32k_clk_sel = { .offset = HHI_32K_CLK_CNTL, .mask = 0x3, .shift = 16, + .table = gxbb_32k_clk_parents_val_table, }, .hw.init = &(struct clk_init_data){ .name = "32k_clk_sel",