From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3079153A7; Fri, 6 Dec 2024 15:06:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733497574; cv=none; b=HzXdT51sOoNKZO2RoWx1PIU5M3Xw1G2+VJDPpLlwsbXMpZhL8HTCTR3celxY7+r5xQfe/i4FOCs2sMujQA8/zOEJlyP3KtaACsDy+eqDiU/hIn4HhwcTigHK+EMPl5N3iQ95RtRWwQzMuULu0w3gEq4Pm2f9YpDMAR3vgnXmDYw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733497574; c=relaxed/simple; bh=SJ94/nM0FpnRfMKcv4EOf2O/YrUihwkRwtkHZjDztHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IUbbBdC8oh3/0sP3QhDqlRY6O1WfgYixX/9+11jdE7GiFCZ2R2L0gz+OxccC7sOdk5SCRM+Kkt9fTkq31iv6hw0jaio07xM1hvObn+APr9wsacHkQuSLEk3at4c6OeoHtNrQb1wTn+xnQF89Sg4l0729DYd3wffKNiWbz0DYEfc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mqQc702e; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mqQc702e" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BD64C4CEDE; Fri, 6 Dec 2024 15:06:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733497573; bh=SJ94/nM0FpnRfMKcv4EOf2O/YrUihwkRwtkHZjDztHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mqQc702eumi+bDkiVPM0e6tApnIUUY48fNVTaDk3fqA8FzsXKzaK1yg9/lj8cgJrv g6DuMiViviAEhTNj2bM86ZVdwQXM9ezk97P5SHZEfc5R8QiIDSuLI0ntbnyDLfR0p6 iV67nd0kkIIvyFXoK+VnULBfPGWvegDrf+jigzYA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nuno Sa , Conor Dooley , Stephen Boyd , Sasha Levin Subject: [PATCH 6.6 329/676] dt-bindings: clock: axi-clkgen: include AXI clk Date: Fri, 6 Dec 2024 15:32:28 +0100 Message-ID: <20241206143706.196479634@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241206143653.344873888@linuxfoundation.org> References: <20241206143653.344873888@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nuno Sa [ Upstream commit 47f3f5a82a31527e027929c5cec3dd1ef5ef30f5 ] In order to access the registers of the HW, we need to make sure that the AXI bus clock is enabled. Hence let's increase the number of clocks by one and add clock-names to differentiate between parent clocks and the bus clock. Fixes: 0e646c52cf0e ("clk: Add axi-clkgen driver") Signed-off-by: Nuno Sa Link: https://lore.kernel.org/r/20241029-axi-clkgen-fix-axiclk-v2-1-bc5e0733ad76@analog.com Reviewed-by: Conor Dooley Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- .../bindings/clock/adi,axi-clkgen.yaml | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml b/Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml index 5e942bccf2778..2b2041818a0a4 100644 --- a/Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml +++ b/Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml @@ -26,9 +26,21 @@ properties: description: Specifies the reference clock(s) from which the output frequency is derived. This must either reference one clock if only the first clock - input is connected or two if both clock inputs are connected. - minItems: 1 - maxItems: 2 + input is connected or two if both clock inputs are connected. The last + clock is the AXI bus clock that needs to be enabled so we can access the + core registers. + minItems: 2 + maxItems: 3 + + clock-names: + oneOf: + - items: + - const: clkin1 + - const: s_axi_aclk + - items: + - const: clkin1 + - const: clkin2 + - const: s_axi_aclk '#clock-cells': const: 0 @@ -40,6 +52,7 @@ required: - compatible - reg - clocks + - clock-names - '#clock-cells' additionalProperties: false @@ -50,5 +63,6 @@ examples: compatible = "adi,axi-clkgen-2.00.a"; #clock-cells = <0>; reg = <0xff000000 0x1000>; - clocks = <&osc 1>; + clocks = <&osc 1>, <&clkc 15>; + clock-names = "clkin1", "s_axi_aclk"; }; -- 2.43.0