Add Pdc, GCC and RPMh clock support for SDX65
Subsystems (5)
v4 cover Add Pdc, GCC and RPMh clock support for SDX65
From: Vamsi Krishna Lanka <[email protected]>
Hello,
Changes from v3:
- Fixed DTbindings and unused varaibles errors reported by kernel test bot
- Rebased on top of v5.16-rc1
Changes from v2:
- Addressed Taniya Das and Vinod Koul's comments related to adding LUCID_EVO PLL type and rpmh support patches
- Collected Rob's Acked-by for the dt-bindings patches
Changes from v1:
- Addressed Bjorn's comments related to the GCC support patch
- Collected Bjorn's and Rob's Reviewed-by for the dt-bindings patches
This patch series adds bindings and device driver changes for GCC, pdc and RPMh clock support for SDX65 Platform.
Thanks,
Vamsi
.../bindings/clock/qcom,gcc-sdx65.yaml | 78 + .../bindings/clock/qcom,rpmhcc.yaml | 1 + .../interrupt-controller/qcom,pdc.txt | 1 + drivers/clk/qcom/Kconfig | 8 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/clk-alpha-pll.c | 171 ++ drivers/clk/qcom/clk-alpha-pll.h | 3 + drivers/clk/qcom/clk-rpmh.c | 25 + drivers/clk/qcom/gcc-sdx65.c | 1589 +++++++++++++++++ include/dt-bindings/clock/qcom,gcc-sdx65.h | 122 ++ 10 files changed, 1999 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sdx65.yaml create mode 100644 drivers/clk/qcom/gcc-sdx65.c create mode 100644 include/dt-bindings/clock/qcom,gcc-sdx65.h
base-commit: 8ab774587903771821b59471cc723bba6d893942
Signature · 1 line
2.33.1
PATCH v4 1/6 dt-bindings: clock: Add SDX65 GCC clock bindings
From: Vamsi krishna Lanka <[email protected]>
Add device tree bindings for global clock controller on SDX65 SOCs.
--- .../bindings/clock/qcom,gcc-sdx65.yaml | 78 +++++++++++ include/dt-bindings/clock/qcom,gcc-sdx65.h | 122 ++++++++++++++++++ 2 files changed, 200 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sdx65.yaml create mode 100644 include/dt-bindings/clock/qcom,gcc-sdx65.h
Documentation/devicetree/bindings/clock/qcom,gcc-sdx65.yaml new file +78 -0
@@ -0,0 +1,78 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/qcom,gcc-sdx65.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Global Clock & Reset Controller Binding for SDX65 + +maintainers: + - Vamsi krishna Lanka <[email protected]> + +description: | + Qualcomm global clock control module which supports the clocks, resets and + power domains on SDX65 + + See also: + - dt-bindings/clock/qcom,gcc-sdx65.h + +properties: + compatible: + const: qcom,gcc-sdx65 + + reg: + maxItems: 1 + + clocks: + items: + - description: Board XO source + - description: Board active XO source + - description: Sleep clock source + - description: PCIE Pipe clock source + - description: USB3 phy wrapper pipe clock source + - description: PLL test clock source (Optional clock) + + clock-names: + items: + - const: bi_tcxo + - const: bi_tcxo_ao + - const: sleep_clk + - const: pcie_pipe_clk + - const: usb3_phy_wrapper_gcc_usb30_pipe_clk + - const: core_bi_pll_test_se # Optional clock + + '#clock-cells': + const: 1 + + '#reset-cells': + const: 1 + + '#power-domain-cells': + const: 1 + +required: + - compatible + - reg + - clocks + - clock-names + - '#clock-cells' + - '#reset-cells' + - '#power-domain-cells' + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,rpmh.h> + clock-controller@100000 { + compatible = "qcom,gcc-sdx65"; + reg = <0x100000 0x1f7400>; + clocks = <&rpmhcc RPMH_CXO_CLK>, <&rpmhcc RPMH_CXO_CLK_A>, <&sleep_clk>, + <&pcie_pipe_clk>, <&usb3_phy_wrapper_gcc_usb30_pipe_clk>, <&pll_test_clk>; + clock-names = "bi_tcxo", "bi_tcxo_ao", "sleep_clk", + "pcie_pipe_clk", "usb3_phy_wrapper_gcc_usb30_pipe_clk", "core_bi_pll_test_se"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; +...
include/dt-bindings/clock/qcom,gcc-sdx65.h new file +122 -0
122 lines not on this page · raw message
Signature · 1 line
2.33.1
Rob Herring
maintainerRe: [PATCH v4 1/6] dt-bindings: clock: Add SDX65 GCC clock bindings
Quoted 41 lines · On Mon, Nov 15, 2021 at 11:38:07PM -0800, [email protected] wrote:
From: Vamsi krishna Lanka <[email protected]>
Add device tree bindings for global clock controller on SDX65 SOCs.
Signed-off-by Vamsi Krishna Lanka <[email protected]>--- .../bindings/clock/qcom,gcc-sdx65.yaml | 78 +++++++++++ include/dt-bindings/clock/qcom,gcc-sdx65.h | 122 ++++++++++++++++++ 2 files changed, 200 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sdx65.yaml create mode 100644 include/dt-bindings/clock/qcom,gcc-sdx65.hDocumentation/devicetree/bindings/clock/qcom,gcc-sdx65.yaml new file +23
-0@@ -0,0 +1,78 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/qcom,gcc-sdx65.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Global Clock & Reset Controller Binding for SDX65 + +maintainers: + - Vamsi krishna Lanka <[email protected]> + +description: | + Qualcomm global clock control module which supports the clocks, resets and + power domains on SDX65 + + See also: + - dt-bindings/clock/qcom,gcc-sdx65.h + +properties: + compatible: + const: qcom,gcc-sdx65 + + reg:
Documentation/devicetree/bindings/clock/qcom,gcc-sdx65.yaml line 33
Quoted 10 lines
Documentation/devicetree/bindings/clock/qcom,gcc-sdx65.yaml new file +10
-0+ maxItems: 1 + + clocks: + items: + - description: Board XO source + - description: Board active XO source + - description: Sleep clock source + - description: PCIE Pipe clock source + - description: USB3 phy wrapper pipe clock source + - description: PLL test clock source (Optional clock)
Optional is defined with 'minItems: 5'
Quoted 177 lines
Documentation/devicetree/bindings/clock/qcom,gcc-sdx65.yaml new file +45
-0+ + clock-names: + items: + - const: bi_tcxo + - const: bi_tcxo_ao + - const: sleep_clk + - const: pcie_pipe_clk + - const: usb3_phy_wrapper_gcc_usb30_pipe_clk + - const: core_bi_pll_test_se # Optional clock + + '#clock-cells': + const: 1 + + '#reset-cells': + const: 1 + + '#power-domain-cells': + const: 1 + +required: + - compatible + - reg + - clocks + - clock-names + - '#clock-cells' + - '#reset-cells' + - '#power-domain-cells' + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,rpmh.h> + clock-controller@100000 { + compatible = "qcom,gcc-sdx65"; + reg = <0x100000 0x1f7400>; + clocks = <&rpmhcc RPMH_CXO_CLK>, <&rpmhcc RPMH_CXO_CLK_A>, <&sleep_clk>, + <&pcie_pipe_clk>, <&usb3_phy_wrapper_gcc_usb30_pipe_clk>, <&pll_test_clk>; + clock-names = "bi_tcxo", "bi_tcxo_ao", "sleep_clk", + "pcie_pipe_clk", "usb3_phy_wrapper_gcc_usb30_pipe_clk", "core_bi_pll_test_se"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; +...include/dt-bindings/clock/qcom,gcc-sdx65.h new file +122
-0@@ -0,0 +1,122 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +/* +* Copyright (c) 2021, Qualcomm Innovation Center, Inc. All rights reserved. +*/ + +#ifndef _DT_BINDINGS_CLK_QCOM_GCC_SDX65_H +#define _DT_BINDINGS_CLK_QCOM_GCC_SDX65_H + +/* GCC clocks */ +#define GPLL0 0 +#define GPLL0_OUT_EVEN 1 +#define GCC_AHB_PCIE_LINK_CLK 2 +#define GCC_BLSP1_AHB_CLK 3 +#define GCC_BLSP1_QUP1_I2C_APPS_CLK 4 +#define GCC_BLSP1_QUP1_I2C_APPS_CLK_SRC 5 +#define GCC_BLSP1_QUP1_SPI_APPS_CLK 6 +#define GCC_BLSP1_QUP1_SPI_APPS_CLK_SRC 7 +#define GCC_BLSP1_QUP2_I2C_APPS_CLK 8 +#define GCC_BLSP1_QUP2_I2C_APPS_CLK_SRC 9 +#define GCC_BLSP1_QUP2_SPI_APPS_CLK 10 +#define GCC_BLSP1_QUP2_SPI_APPS_CLK_SRC 11 +#define GCC_BLSP1_QUP3_I2C_APPS_CLK 12 +#define GCC_BLSP1_QUP3_I2C_APPS_CLK_SRC 13 +#define GCC_BLSP1_QUP3_SPI_APPS_CLK 14 +#define GCC_BLSP1_QUP3_SPI_APPS_CLK_SRC 15 +#define GCC_BLSP1_QUP4_I2C_APPS_CLK 16 +#define GCC_BLSP1_QUP4_I2C_APPS_CLK_SRC 17 +#define GCC_BLSP1_QUP4_SPI_APPS_CLK 18 +#define GCC_BLSP1_QUP4_SPI_APPS_CLK_SRC 19 +#define GCC_BLSP1_SLEEP_CLK 20 +#define GCC_BLSP1_UART1_APPS_CLK 21 +#define GCC_BLSP1_UART1_APPS_CLK_SRC 22 +#define GCC_BLSP1_UART2_APPS_CLK 23 +#define GCC_BLSP1_UART2_APPS_CLK_SRC 24 +#define GCC_BLSP1_UART3_APPS_CLK 25 +#define GCC_BLSP1_UART3_APPS_CLK_SRC 26 +#define GCC_BLSP1_UART4_APPS_CLK 27 +#define GCC_BLSP1_UART4_APPS_CLK_SRC 28 +#define GCC_BOOT_ROM_AHB_CLK 29 +#define GCC_CPUSS_AHB_CLK 30 +#define GCC_CPUSS_AHB_CLK_SRC 31 +#define GCC_CPUSS_AHB_POSTDIV_CLK_SRC 32 +#define GCC_CPUSS_GNOC_CLK 33 +#define GCC_GP1_CLK 34 +#define GCC_GP1_CLK_SRC 35 +#define GCC_GP2_CLK 36 +#define GCC_GP2_CLK_SRC 37 +#define GCC_GP3_CLK 38 +#define GCC_GP3_CLK_SRC 39 +#define GCC_PCIE_0_CLKREF_EN 40 +#define GCC_PCIE_AUX_CLK 41 +#define GCC_PCIE_AUX_CLK_SRC 42 +#define GCC_PCIE_AUX_PHY_CLK_SRC 43 +#define GCC_PCIE_CFG_AHB_CLK 44 +#define GCC_PCIE_MSTR_AXI_CLK 45 +#define GCC_PCIE_PIPE_CLK 46 +#define GCC_PCIE_PIPE_CLK_SRC 47 +#define GCC_PCIE_RCHNG_PHY_CLK 48 +#define GCC_PCIE_RCHNG_PHY_CLK_SRC 49 +#define GCC_PCIE_SLEEP_CLK 50 +#define GCC_PCIE_SLV_AXI_CLK 51 +#define GCC_PCIE_SLV_Q2A_AXI_CLK 52 +#define GCC_PDM2_CLK 53 +#define GCC_PDM2_CLK_SRC 54 +#define GCC_PDM_AHB_CLK 55 +#define GCC_PDM_XO4_CLK 56 +#define GCC_RX1_USB2_CLKREF_EN 57 +#define GCC_SDCC1_AHB_CLK 58 +#define GCC_SDCC1_APPS_CLK 59 +#define GCC_SDCC1_APPS_CLK_SRC 60 +#define GCC_SPMI_FETCHER_AHB_CLK 61 +#define GCC_SPMI_FETCHER_CLK 62 +#define GCC_SPMI_FETCHER_CLK_SRC 63 +#define GCC_SYS_NOC_CPUSS_AHB_CLK 64 +#define GCC_USB30_MASTER_CLK 65 +#define GCC_USB30_MASTER_CLK_SRC 66 +#define GCC_USB30_MOCK_UTMI_CLK 67 +#define GCC_USB30_MOCK_UTMI_CLK_SRC 68 +#define GCC_USB30_MOCK_UTMI_POSTDIV_CLK_SRC 69 +#define GCC_USB30_MSTR_AXI_CLK 70 +#define GCC_USB30_SLEEP_CLK 71 +#define GCC_USB30_SLV_AHB_CLK 72 +#define GCC_USB3_PHY_AUX_CLK 73 +#define GCC_USB3_PHY_AUX_CLK_SRC 74 +#define GCC_USB3_PHY_PIPE_CLK 75 +#define GCC_USB3_PHY_PIPE_CLK_SRC 76 +#define GCC_USB3_PRIM_CLKREF_EN 77 +#define GCC_USB_PHY_CFG_AHB2PHY_CLK 78 +#define GCC_XO_DIV4_CLK 79 +#define GCC_XO_PCIE_LINK_CLK 80 + +/* GCC resets */ +#define GCC_BLSP1_QUP1_BCR 0 +#define GCC_BLSP1_QUP2_BCR 1 +#define GCC_BLSP1_QUP3_BCR 2 +#define GCC_BLSP1_QUP4_BCR 3 +#define GCC_BLSP1_UART1_BCR 4 +#define GCC_BLSP1_UART2_BCR 5 +#define GCC_BLSP1_UART3_BCR 6 +#define GCC_BLSP1_UART4_BCR 7 +#define GCC_PCIE_BCR 8 +#define GCC_PCIE_LINK_DOWN_BCR 9 +#define GCC_PCIE_NOCSR_COM_PHY_BCR 10 +#define GCC_PCIE_PHY_BCR 11 +#define GCC_PCIE_PHY_CFG_AHB_BCR 12 +#define GCC_PCIE_PHY_COM_BCR 13 +#define GCC_PCIE_PHY_NOCSR_COM_PHY_BCR 14 +#define GCC_PDM_BCR 15 +#define GCC_QUSB2PHY_BCR 16 +#define GCC_SDCC1_BCR 17 +#define GCC_SPMI_FETCHER_BCR 18 +#define GCC_TCSR_PCIE_BCR 19 +#define GCC_USB30_BCR 20 +#define GCC_USB3_PHY_BCR 21 +#define GCC_USB3PHY_PHY_BCR 22 +#define GCC_USB_PHY_CFG_AHB2PHY_BCR 23 + +/* GCC power domains */ +#define USB30_GDSC 0 +#define PCIE_GDSC 1 + +#endif Signature · 1 line
2.33.1
PATCH v4 2/6 clk: qcom: Add LUCID_EVO PLL type for SDX65
In reply to [email protected]From: Vamsi Krishna Lanka <[email protected]>
Add a LUCID_EVO PLL type for SDX65 SoC from Qualcomm.
--- drivers/clk/qcom/clk-alpha-pll.c | 171 +++++++++++++++++++++++++++++++ drivers/clk/qcom/clk-alpha-pll.h | 3 + 2 files changed, 174 insertions(+)
drivers/clk/qcom/clk-alpha-pll.c +171 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* +* Copyright (c) 2021, Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015, 2018, The Linux Foundation. All rights reserved. */
@@ -139,6 +140,20 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS] = { [PLL_OFF_OPMODE] = 0x28, [PLL_OFF_STATUS] = 0x38, }, + [CLK_ALPHA_PLL_TYPE_LUCID_EVO] = { + [PLL_OFF_OPMODE] = 0x04, + [PLL_OFF_STATUS] = 0x0c, + [PLL_OFF_L_VAL] = 0x10, + [PLL_OFF_ALPHA_VAL] = 0x14, + [PLL_OFF_USER_CTL] = 0x18, + [PLL_OFF_USER_CTL_U] = 0x1c, + [PLL_OFF_CONFIG_CTL] = 0x20, + [PLL_OFF_CONFIG_CTL_U] = 0x24, + [PLL_OFF_CONFIG_CTL_U1] = 0x28, + [PLL_OFF_TEST_CTL] = 0x2c, + [PLL_OFF_TEST_CTL_U] = 0x30, + [PLL_OFF_TEST_CTL_U1] = 0x34, + }, };EXPORT_SYMBOL_GPL (clk_alpha_pll_regs);
@@ -175,6 +190,10 @@ EXPORT_SYMBOL_GPL(clk_alpha_pll_regs);#define LUCID_5LPE_PLL_LATCH_INPUT BIT(14)#define LUCID_5LPE_ENABLE_VOTE_RUN BIT(21) +/* LUCID EVO PLL specific settings and offsets */ +#define LUCID_EVO_ENABLE_VOTE_RUN BIT(25) +#define LUCID_EVO_PLL_L_VAL_MASK GENMASK(15, 0) +/* ZONDA PLL specific */ #define ZONDA_PLL_OUT_MASK 0xf#define ZONDA_STAY_IN_CFA BIT(16)
@@ -1951,3 +1970,155 @@ const struct clk_ops clk_alpha_pll_zonda_ops = { .set_rate = clk_zonda_pll_set_rate, };EXPORT_SYMBOL (clk_alpha_pll_zonda_ops); + +static int alpha_pll_lucid_evo_enable (struct clk_hw *hw) +{ +struct clk_alpha_pll *pll =to_clk_alpha_pll (hw); +struct regmap *regmap = pll->clkr.regmap; +u32 val; +int ret; + + ret =regmap_read (regmap,PLL_USER_CTL (pll), &val); +if (ret) +return ret; + +/* If in FSM mode, just vote for it */ +if (val &LUCID_EVO_ENABLE_VOTE_RUN ) { + ret =clk_enable_regmap (hw); +if (ret) +return ret; +return wait_for_pll_enable_lock (pll); + } + +/* Check if PLL is already enabled */ + ret =trion_pll_is_enabled (pll, regmap); +if (ret <0 ) +return ret; +else if (ret) { +pr_warn ("%s PLL is already enabled\n" , +clk_hw_get_name (&pll->clkr.hw)); +return 0 ; + } + + ret =regmap_update_bits (regmap,PLL_MODE (pll),PLL_RESET_N ,PLL_RESET_N ); +if (ret) +return ret; + +/* Set operation mode to RUN */ +regmap_write (regmap,PLL_OPMODE (pll),PLL_RUN ); + + ret =wait_for_pll_enable_lock (pll); +if (ret) +return ret; + +/* Enable the PLL outputs */ + ret =regmap_update_bits (regmap,PLL_USER_CTL (pll),PLL_OUT_MASK ,PLL_OUT_MASK ); +if (ret) +return ret; + +/* Enable the global PLL outputs */ + ret =regmap_update_bits (regmap,PLL_MODE (pll),PLL_OUTCTRL ,PLL_OUTCTRL ); +if (ret) +return ret; + +/* Ensure that the write above goes through before returning. */ +mb (); +return ret; +} + +static void alpha_pll_lucid_evo_disable (struct clk_hw *hw) +{ +struct clk_alpha_pll *pll =to_clk_alpha_pll (hw); +struct regmap *regmap = pll->clkr.regmap; +u32 val; +int ret; + + ret =regmap_read (regmap,PLL_USER_CTL (pll), &val); +if (ret) +return ; + +/* If in FSM mode, just unvote it */ +if (val &LUCID_EVO_ENABLE_VOTE_RUN ) { +clk_disable_regmap (hw); +return ; + } + +/* Disable the global PLL output */ + ret =regmap_update_bits (regmap,PLL_MODE (pll),PLL_OUTCTRL ,0 ); +if (ret) +return ; + +/* Disable the PLL outputs */ + ret =regmap_update_bits (regmap,PLL_USER_CTL (pll),PLL_OUT_MASK ,0 ); +if (ret) +return ; + +/* Place the PLL mode in STANDBY */ +regmap_write (regmap,PLL_OPMODE (pll),PLL_STANDBY ); +} + +static unsigned long alpha_pll_lucid_evo_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct clk_alpha_pll *pll =to_clk_alpha_pll (hw); +struct regmap *regmap = pll->clkr.regmap; +u32 l, frac; + +regmap_read (regmap,PLL_L_VAL (pll), &l); + l &=LUCID_EVO_PLL_L_VAL_MASK ; +regmap_read (regmap,PLL_ALPHA_VAL (pll), &frac); + +return alpha_pll_calc_rate (parent_rate, l, frac,pll_alpha_width (pll)); +} + +static int clk_lucid_evo_pll_postdiv_set_rate (struct clk_hw *hw, +unsigned long rate,unsigned long parent_rate) +{ +struct clk_alpha_pll_postdiv *pll =to_clk_alpha_pll_postdiv (hw); +struct regmap *regmap = pll->clkr.regmap; +int i, val, div, ret; + +/* +* If the PLL is in FSM mode, then treat set_rate callback as a +* no-operation. +*/ + ret =regmap_read (regmap,PLL_USER_CTL (pll), &val); +if (ret) +return ret; + +if (val &LUCID_EVO_ENABLE_VOTE_RUN ) +return 0 ; + +if (!pll->post_div_table) { +pr_err ("Missing the post_div_table for the PLL\n" ); +return -EINVAL ; + } + + div =DIV_ROUND_UP_ULL ((u64 )parent_rate, rate); +for (i =0 ; i < pll->num_post_div; i++) { +if (pll->post_div_table[i].div == div) { + val = pll->post_div_table[i].val; +break ; + } + } + +return regmap_update_bits (regmap,PLL_USER_CTL (pll), + (BIT (pll->width) -1 ) << pll->post_div_shift, + val << pll->post_div_shift); +} + +const struct clk_ops clk_alpha_pll_fixed_lucid_evo_ops = { + .enable = alpha_pll_lucid_evo_enable, + .disable = alpha_pll_lucid_evo_disable, + .is_enabled = clk_trion_pll_is_enabled, + .recalc_rate = alpha_pll_lucid_evo_recalc_rate, + .round_rate = clk_alpha_pll_round_rate, +}; +EXPORT_SYMBOL_GPL (clk_alpha_pll_fixed_lucid_evo_ops); + +const struct clk_ops clk_alpha_pll_postdiv_lucid_evo_ops = { + .recalc_rate = clk_alpha_pll_postdiv_fabia_recalc_rate, + .round_rate = clk_alpha_pll_postdiv_fabia_round_rate, + .set_rate = clk_lucid_evo_pll_postdiv_set_rate, +}; +EXPORT_SYMBOL_GPL (clk_alpha_pll_postdiv_lucid_evo_ops);
drivers/clk/qcom/clk-alpha-pll.h +3 -0
@@ -17,6 +17,7 @@ enum {CLK_ALPHA_PLL_TYPE_LUCID =CLK_ALPHA_PLL_TYPE_TRION ,CLK_ALPHA_PLL_TYPE_AGERA ,CLK_ALPHA_PLL_TYPE_ZONDA , +CLK_ALPHA_PLL_TYPE_LUCID_EVO , CLK_ALPHA_PLL_TYPE_MAX, };
@@ -151,6 +152,8 @@ extern const struct clk_ops clk_alpha_pll_postdiv_lucid_5lpe_ops;extern const struct clk_ops clk_alpha_pll_zonda_ops;#define clk_alpha_pll_postdiv_zonda_ops clk_alpha_pll_postdiv_fabia_ops +extern const struct clk_ops clk_alpha_pll_fixed_lucid_evo_ops; +extern const struct clk_ops clk_alpha_pll_postdiv_lucid_evo_ops;void clk_alpha_pll_configure (struct clk_alpha_pll *pll,struct regmap *regmap,const struct alpha_pll_config *config);
Signature · 1 line
2.33.1
Re: [PATCH v4 2/6] clk: qcom: Add LUCID_EVO PLL type for SDX65
Quoted 15 lines · On 15-11-21, 23:38, [email protected] wrote:
From: Vamsi Krishna Lanka <[email protected]>
Add a
LUCID_EVOPLL type for SDX65 SoC from Qualcomm.Signed-off-by Vamsi Krishna Lanka <[email protected]>--- drivers/clk/qcom/clk-alpha-pll.c | 171 +++++++++++++++++++++++++++++++ drivers/clk/qcom/clk-alpha-pll.h | 3 + 2 files changed, 174 insertions(+)drivers/clk/qcom/clk-alpha-pll.c +0
-0
drivers/clk/qcom/clk-alpha-pll.c line 3
Quoted 3 lines
drivers/clk/qcom/clk-alpha-pll.c +1
-0@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* +* Copyright (c) 2021, Qualcomm Innovation Center, Inc. All rights reserved.
This line should ideally come after the below line..
Quoted 56 lines
drivers/clk/qcom/clk-alpha-pll.c +35
-0* Copyright (c) 2015, 2018, The Linux Foundation. All rights reserved. */ @@ -139,6 +140,20 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS] = { [PLL_OFF_OPMODE] = 0x28, [PLL_OFF_STATUS] = 0x38, }, + [CLK_ALPHA_PLL_TYPE_LUCID_EVO] = { + [PLL_OFF_OPMODE] = 0x04, + [PLL_OFF_STATUS] = 0x0c, + [PLL_OFF_L_VAL] = 0x10, + [PLL_OFF_ALPHA_VAL] = 0x14, + [PLL_OFF_USER_CTL] = 0x18, + [PLL_OFF_USER_CTL_U] = 0x1c, + [PLL_OFF_CONFIG_CTL] = 0x20, + [PLL_OFF_CONFIG_CTL_U] = 0x24, + [PLL_OFF_CONFIG_CTL_U1] = 0x28, + [PLL_OFF_TEST_CTL] = 0x2c, + [PLL_OFF_TEST_CTL_U] = 0x30, + [PLL_OFF_TEST_CTL_U1] = 0x34, + }, };EXPORT_SYMBOL_GPL (clk_alpha_pll_regs);@@ -175,6 +190,10 @@ EXPORT_SYMBOL_GPL(clk_alpha_pll_regs);#define LUCID_5LPE_PLL_LATCH_INPUT BIT(14)#define LUCID_5LPE_ENABLE_VOTE_RUN BIT(21) +/* LUCID EVO PLL specific settings and offsets */ +#define LUCID_EVO_ENABLE_VOTE_RUN BIT(25) +#define LUCID_EVO_PLL_L_VAL_MASK GENMASK(15, 0) +/* ZONDA PLL specific */ #define ZONDA_PLL_OUT_MASK 0xf#define ZONDA_STAY_IN_CFA BIT(16)@@ -1951,3 +1970,155 @@ const struct clk_ops clk_alpha_pll_zonda_ops = { .set_rate = clk_zonda_pll_set_rate, };EXPORT_SYMBOL (clk_alpha_pll_zonda_ops); + +static int alpha_pll_lucid_evo_enable (struct clk_hw *hw) +{ +struct clk_alpha_pll *pll =to_clk_alpha_pll (hw); +struct regmap *regmap = pll->clkr.regmap; +u32 val; +int ret; + + ret =regmap_read (regmap,PLL_USER_CTL (pll), &val); +if (ret) +return ret; + +/* If in FSM mode, just vote for it */ +if (val &LUCID_EVO_ENABLE_VOTE_RUN ) { + ret =clk_enable_regmap (hw); +if (ret) +return ret;
drivers/clk/qcom/clk-alpha-pll.c const struct clk_ops clk_alpha_pll_zonda_ops = { · line 1999
Quoted 10 lines
drivers/clk/qcom/clk-alpha-pll.c +10
-0+return wait_for_pll_enable_lock (pll); + } + +/* Check if PLL is already enabled */ + ret =trion_pll_is_enabled (pll, regmap); +if (ret <0 ) +return ret; +else if (ret) { +pr_warn ("%s PLL is already enabled\n" , +clk_hw_get_name (&pll->clkr.hw));
this should fit in a single line
Quoted 52 lines
drivers/clk/qcom/clk-alpha-pll.c +52
-0+return 0 ; + } + + ret =regmap_update_bits (regmap,PLL_MODE (pll),PLL_RESET_N ,PLL_RESET_N ); +if (ret) +return ret; + +/* Set operation mode to RUN */ +regmap_write (regmap,PLL_OPMODE (pll),PLL_RUN ); + + ret =wait_for_pll_enable_lock (pll); +if (ret) +return ret; + +/* Enable the PLL outputs */ + ret =regmap_update_bits (regmap,PLL_USER_CTL (pll),PLL_OUT_MASK ,PLL_OUT_MASK ); +if (ret) +return ret; + +/* Enable the global PLL outputs */ + ret =regmap_update_bits (regmap,PLL_MODE (pll),PLL_OUTCTRL ,PLL_OUTCTRL ); +if (ret) +return ret; + +/* Ensure that the write above goes through before returning. */ +mb (); +return ret; +} + +static void alpha_pll_lucid_evo_disable (struct clk_hw *hw) +{ +struct clk_alpha_pll *pll =to_clk_alpha_pll (hw); +struct regmap *regmap = pll->clkr.regmap; +u32 val; +int ret; + + ret =regmap_read (regmap,PLL_USER_CTL (pll), &val); +if (ret) +return ; + +/* If in FSM mode, just unvote it */ +if (val &LUCID_EVO_ENABLE_VOTE_RUN ) { +clk_disable_regmap (hw); +return ; + } + +/* Disable the global PLL output */ + ret =regmap_update_bits (regmap,PLL_MODE (pll),PLL_OUTCTRL ,0 ); +if (ret) +return ; + +/* Disable the PLL outputs */
drivers/clk/qcom/clk-alpha-pll.c const struct clk_ops clk_alpha_pll_zonda_ops = { · line 2061
Quoted 10 lines
drivers/clk/qcom/clk-alpha-pll.c +10
-0+ ret =regmap_update_bits (regmap,PLL_USER_CTL (pll),PLL_OUT_MASK ,0 ); +if (ret) +return ; + +/* Place the PLL mode in STANDBY */ +regmap_write (regmap,PLL_OPMODE (pll),PLL_STANDBY ); +} + +static unsigned long alpha_pll_lucid_evo_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate)
pls align this to preceding line open brace
drivers/clk/qcom/clk-alpha-pll.c const struct clk_ops clk_alpha_pll_zonda_ops = { · line 2072
Quoted 11 lines
drivers/clk/qcom/clk-alpha-pll.c +11
-0+{ +struct clk_alpha_pll *pll =to_clk_alpha_pll (hw); +struct regmap *regmap = pll->clkr.regmap; +u32 l, frac; + +regmap_read (regmap,PLL_L_VAL (pll), &l); + l &=LUCID_EVO_PLL_L_VAL_MASK ; +regmap_read (regmap,PLL_ALPHA_VAL (pll), &frac); + +return alpha_pll_calc_rate (parent_rate, l, frac,pll_alpha_width (pll)); +}
I think this can use __alpha_pll_trion_set_rate()
Quoted 26 lines
drivers/clk/qcom/clk-alpha-pll.c +26
-0+ +static int clk_lucid_evo_pll_postdiv_set_rate (struct clk_hw *hw, +unsigned long rate,unsigned long parent_rate) +{ +struct clk_alpha_pll_postdiv *pll =to_clk_alpha_pll_postdiv (hw); +struct regmap *regmap = pll->clkr.regmap; +int i, val, div, ret; + +/* +* If the PLL is in FSM mode, then treat set_rate callback as a +* no-operation. +*/ + ret =regmap_read (regmap,PLL_USER_CTL (pll), &val); +if (ret) +return ret; + +if (val &LUCID_EVO_ENABLE_VOTE_RUN ) +return 0 ; + +if (!pll->post_div_table) { +pr_err ("Missing the post_div_table for the PLL\n" ); +return -EINVAL ; + } + + div =DIV_ROUND_UP_ULL ((u64 )parent_rate, rate); +for (i =0 ; i < pll->num_post_div; i++) {
drivers/clk/qcom/clk-alpha-pll.c const struct clk_ops clk_alpha_pll_zonda_ops = { · line 2108
Quoted 10 lines
drivers/clk/qcom/clk-alpha-pll.c +10
-0+if (pll->post_div_table[i].div == div) { + val = pll->post_div_table[i].val; +break ; + } + } + +return regmap_update_bits (regmap,PLL_USER_CTL (pll), + (BIT (pll->width) -1 ) << pll->post_div_shift, + val << pll->post_div_shift); +}
This looks _very_ similar to clk_lucid_5lpe_pll_postdiv_set_rate() maybe add a helper which both can use and pass on the LUCID_EVO_ENABLE_VOTE_RUN as argument to helper?
Signature · 1 line
~Vinod
Re: [PATCH v4 2/6] clk: qcom: Add LUCID_EVO PLL type for SDX65
Quoted 11 lines · Vinod Koul
Quoted 10 lines · On 15-11-21, 23:38, [email protected] wrote:
From: Vamsi Krishna Lanka <[email protected]>
Add a
LUCID_EVOPLL type for SDX65 SoC from Qualcomm.Signed-off-by Vamsi Krishna Lanka <[email protected]>--- drivers/clk/qcom/clk-alpha-pll.c | 171 +++++++++++++++++++++++++++++++ drivers/clk/qcom/clk-alpha-pll.h | 3 + 2 files changed, 174 insertions(+)
Quoted 10 lines
drivers/clk/qcom/clk-alpha-pll.c line 3
Quoted 8 lines
drivers/clk/qcom/clk-alpha-pll.c +1
-0@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* +* Copyright (c) 2021, Qualcomm Innovation Center, Inc. All rights reserved. This line should ideally come after the below line..
Will do.
Quoted 61 lines
Quoted 61 lines
drivers/clk/qcom/clk-alpha-pll.c +39
-0* Copyright (c) 2015, 2018, The Linux Foundation. All rights reserved. */ @@ -139,6 +140,20 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MAX_REGS] = { [PLL_OFF_OPMODE] = 0x28, [PLL_OFF_STATUS] = 0x38, }, + [CLK_ALPHA_PLL_TYPE_LUCID_EVO] = { + [PLL_OFF_OPMODE] = 0x04, + [PLL_OFF_STATUS] = 0x0c, + [PLL_OFF_L_VAL] = 0x10, + [PLL_OFF_ALPHA_VAL] = 0x14, + [PLL_OFF_USER_CTL] = 0x18, + [PLL_OFF_USER_CTL_U] = 0x1c, + [PLL_OFF_CONFIG_CTL] = 0x20, + [PLL_OFF_CONFIG_CTL_U] = 0x24, + [PLL_OFF_CONFIG_CTL_U1] = 0x28, + [PLL_OFF_TEST_CTL] = 0x2c, + [PLL_OFF_TEST_CTL_U] = 0x30, + [PLL_OFF_TEST_CTL_U1] = 0x34, + }, };EXPORT_SYMBOL_GPL (clk_alpha_pll_regs);@@ -175,6 +190,10 @@ EXPORT_SYMBOL_GPL(clk_alpha_pll_regs);#define LUCID_5LPE_PLL_LATCH_INPUT BIT(14)#define LUCID_5LPE_ENABLE_VOTE_RUN BIT(21) +/* LUCID EVO PLL specific settings and offsets */ +#define LUCID_EVO_ENABLE_VOTE_RUN BIT(25) +#define LUCID_EVO_PLL_L_VAL_MASK GENMASK(15, 0) +/* ZONDA PLL specific */ #define ZONDA_PLL_OUT_MASK 0xf#define ZONDA_STAY_IN_CFA BIT(16)@@ -1951,3 +1970,155 @@ const struct clk_ops clk_alpha_pll_zonda_ops = { .set_rate = clk_zonda_pll_set_rate, };EXPORT_SYMBOL (clk_alpha_pll_zonda_ops); + +static int alpha_pll_lucid_evo_enable (struct clk_hw *hw) +{ +struct clk_alpha_pll *pll =to_clk_alpha_pll (hw); +struct regmap *regmap = pll->clkr.regmap; +u32 val; +int ret; + + ret =regmap_read (regmap,PLL_USER_CTL (pll), &val); +if (ret) +return ret; + +/* If in FSM mode, just vote for it */ +if (val &LUCID_EVO_ENABLE_VOTE_RUN ) { + ret =clk_enable_regmap (hw); +if (ret) +return ret; +return wait_for_pll_enable_lock (pll); + } + +/* Check if PLL is already enabled */
Quoted 8 lines
drivers/clk/qcom/clk-alpha-pll.c const struct clk_ops clk_alpha_pll_zonda_ops = { · line 1999
Quoted 6 lines
drivers/clk/qcom/clk-alpha-pll.c +6
-0+ ret =trion_pll_is_enabled (pll, regmap); +if (ret <0 ) +return ret; +else if (ret) { +pr_warn ("%s PLL is already enabled\n" , +clk_hw_get_name (&pll->clkr.hw));this should fit in a single line
Will do.
Quoted 57 lines
Quoted 57 lines
drivers/clk/qcom/clk-alpha-pll.c +56
-0+return 0 ; + } + + ret =regmap_update_bits (regmap,PLL_MODE (pll),PLL_RESET_N ,PLL_RESET_N ); +if (ret) +return ret; + +/* Set operation mode to RUN */ +regmap_write (regmap,PLL_OPMODE (pll),PLL_RUN ); + + ret =wait_for_pll_enable_lock (pll); +if (ret) +return ret; + +/* Enable the PLL outputs */ + ret =regmap_update_bits (regmap,PLL_USER_CTL (pll),PLL_OUT_MASK ,PLL_OUT_MASK ); +if (ret) +return ret; + +/* Enable the global PLL outputs */ + ret =regmap_update_bits (regmap,PLL_MODE (pll),PLL_OUTCTRL ,PLL_OUTCTRL ); +if (ret) +return ret; + +/* Ensure that the write above goes through before returning. */ +mb (); +return ret; +} + +static void alpha_pll_lucid_evo_disable (struct clk_hw *hw) +{ +struct clk_alpha_pll *pll =to_clk_alpha_pll (hw); +struct regmap *regmap = pll->clkr.regmap; +u32 val; +int ret; + + ret =regmap_read (regmap,PLL_USER_CTL (pll), &val); +if (ret) +return ; + +/* If in FSM mode, just unvote it */ +if (val &LUCID_EVO_ENABLE_VOTE_RUN ) { +clk_disable_regmap (hw); +return ; + } + +/* Disable the global PLL output */ + ret =regmap_update_bits (regmap,PLL_MODE (pll),PLL_OUTCTRL ,0 ); +if (ret) +return ; + +/* Disable the PLL outputs */ + ret =regmap_update_bits (regmap,PLL_USER_CTL (pll),PLL_OUT_MASK ,0 ); +if (ret) +return ; +
Quoted 8 lines
drivers/clk/qcom/clk-alpha-pll.c const struct clk_ops clk_alpha_pll_zonda_ops = { · line 2061
Quoted 6 lines
drivers/clk/qcom/clk-alpha-pll.c +6
-0+/* Place the PLL mode in STANDBY */ +regmap_write (regmap,PLL_OPMODE (pll),PLL_STANDBY ); +} + +static unsigned long alpha_pll_lucid_evo_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate)pls align this to preceding line open brace
Will do.
Quoted 14 lines
drivers/clk/qcom/clk-alpha-pll.c const struct clk_ops clk_alpha_pll_zonda_ops = { · line 2072
Quoted 12 lines
drivers/clk/qcom/clk-alpha-pll.c +11
-0+{ +struct clk_alpha_pll *pll =to_clk_alpha_pll (hw); +struct regmap *regmap = pll->clkr.regmap; +u32 l, frac; + +regmap_read (regmap,PLL_L_VAL (pll), &l); + l &=LUCID_EVO_PLL_L_VAL_MASK ; +regmap_read (regmap,PLL_ALPHA_VAL (pll), &frac); + +return alpha_pll_calc_rate (parent_rate, l, frac,pll_alpha_width (pll)); +}I think this can use
__alpha_pll_trion_set_rate()
I didn't get with which function are you comparing this. I cannot able to find any function similar to this.
Quoted 33 lines
Quoted 33 lines
drivers/clk/qcom/clk-alpha-pll.c +32
-0+ +static int clk_lucid_evo_pll_postdiv_set_rate (struct clk_hw *hw, +unsigned long rate,unsigned long parent_rate) +{ +struct clk_alpha_pll_postdiv *pll =to_clk_alpha_pll_postdiv (hw); +struct regmap *regmap = pll->clkr.regmap; +int i, val, div, ret; + +/* +* If the PLL is in FSM mode, then treat set_rate callback as a +* no-operation. +*/ + ret =regmap_read (regmap,PLL_USER_CTL (pll), &val); +if (ret) +return ret; + +if (val &LUCID_EVO_ENABLE_VOTE_RUN ) +return 0 ; + +if (!pll->post_div_table) { +pr_err ("Missing the post_div_table for the PLL\n" ); +return -EINVAL ; + } + + div =DIV_ROUND_UP_ULL ((u64 )parent_rate, rate); +for (i =0 ; i < pll->num_post_div; i++) { +if (pll->post_div_table[i].div == div) { + val = pll->post_div_table[i].val; +break ; + } + } +
Quoted 8 lines
drivers/clk/qcom/clk-alpha-pll.c const struct clk_ops clk_alpha_pll_zonda_ops = { · line 2108
Quoted 4 lines
drivers/clk/qcom/clk-alpha-pll.c +4
-0+return regmap_update_bits (regmap,PLL_USER_CTL (pll), + (BIT (pll->width) -1 ) << pll->post_div_shift, + val << pll->post_div_shift); +}This looks _very_ similar to
clk_lucid_5lpe_pll_postdiv_set_rate()maybe add a helper which both can use and pass on theLUCID_EVO_ENABLE_VOTE_RUNas argument to helper?
That's a good thought. I can do that.
Quoted 3 lines
Signature · 2 lines
-- ~Vinod
Re: [PATCH v4 2/6] clk: qcom: Add LUCID_EVO PLL type for SDX65
Quoted 19 lines · Vamsi Krishna Lanka
Quoted 16 lines · Vinod Koul
drivers/clk/qcom/clk-alpha-pll.c const struct clk_ops clk_alpha_pll_zonda_ops = { · line 2072
Quoted 13 lines · On 15-11-21, 23:38, [email protected] wrote:
From: Vamsi Krishna Lanka <[email protected]>
drivers/clk/qcom/clk-alpha-pll.c +11
-0+{ +struct clk_alpha_pll *pll =to_clk_alpha_pll (hw); +struct regmap *regmap = pll->clkr.regmap; +u32 l, frac; + +regmap_read (regmap,PLL_L_VAL (pll), &l); + l &=LUCID_EVO_PLL_L_VAL_MASK ; +regmap_read (regmap,PLL_ALPHA_VAL (pll), &frac); + +return alpha_pll_calc_rate (parent_rate, l, frac,pll_alpha_width (pll)); +}I think this can use
__alpha_pll_trion_set_rate()
Quoted 2 lines
I didn't get with which function are you comparing this. I cannot able to find any function similar to this.
This is in upstream, pls see commit: 80ca7765fc75 ("clk: qcom:
clk-alpha-pll: modularize alpha_pll_trion_set_rate()")
Signature · 1 line
~Vinod
PATCH v4 3/6 clk: qcom: Add SDX65 GCC support
In reply to [email protected]From: Vamsi Krishna Lanka <[email protected]>
Add Global Clock Controller (GCC) support for SDX65 SoCs from Qualcomm.
--- drivers/clk/qcom/Kconfig | 8 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/gcc-sdx65.c | 1589 ++++++++++++++++++++++++++++++++++ 3 files changed, 1598 insertions(+) create mode 100644 drivers/clk/qcom/gcc-sdx65.c
drivers/clk/qcom/Kconfig +8 -0
@@ -564,6 +564,14 @@ config SM_CAMCC_8250 Support for the camera clock controller on SM8250 devices. Say Y if you want to support camera devices and camera functionality. +config SDX_GCC_65 + tristate "SDX65 Global Clock Controller" + select QCOM_GDSC + help + Support for the global clock controller on SDX65 devices. + Say Y if you want to use peripheral devices such as UART, + SPI, I2C, USB, SD/UFS, PCIe etc. + config SM_DISPCC_8250 tristate "SM8150 and SM8250 Display Clock Controller" depends on SM_GCC_8150 || SM_GCC_8250
drivers/clk/qcom/Makefile +1 -0
@@ -83,6 +83,7 @@ obj-$(CONFIG_SDM_LPASSCC_845) += lpasscc-sdm845.o obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o obj-$(CONFIG_SDX_GCC_55) += gcc-sdx55.o obj-$(CONFIG_SM_CAMCC_8250) += camcc-sm8250.o +obj-$(CONFIG_SDX_GCC_65) += gcc-sdx65.o obj-$(CONFIG_SM_DISPCC_8250) += dispcc-sm8250.o obj-$(CONFIG_SM_GCC_6115) += gcc-sm6115.o obj-$(CONFIG_SM_GCC_6125) += gcc-sm6125.o
drivers/clk/qcom/gcc-sdx65.c new file +1589 -0
1,589 lines not on this page · raw message
Signature · 1 line
2.33.1
Re: [PATCH v4 3/6] clk: qcom: Add SDX65 GCC support
Quoted 6 lines · On 15-11-21, 23:38, [email protected] wrote:
From: Vamsi Krishna Lanka <[email protected]>
Add Global Clock Controller (GCC) support for SDX65 SoCs from Qualcomm.
Signed-off-by Vamsi Krishna Lanka <[email protected]>Reported-by kernel test robot <[email protected]>
Missing support reported ??
drivers/clk/qcom/gcc-sdx65.c line 671
Quoted 11 lines
drivers/clk/qcom/gcc-sdx65.c new file +11
-0+static struct clk_branch gcc_ahb_pcie_link_clk = { + .halt_reg =0x2e004 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2e004 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="gcc_ahb_pcie_link_clk" , + .flags =CLK_IS_CRITICAL , + .ops = &clk_branch2_ops, + },
If this clk is critical then why model in linux, enable directly in probe and leave it...?
drivers/clk/qcom/gcc-sdx65.c line 988
Quoted 3 lines
drivers/clk/qcom/gcc-sdx65.c new file +3
-0+static struct clk_branch gcc_pcie_0_clkref_en = { + .halt_reg =0x88004 , + .halt_check =BRANCH_HALT_DELAY ,
Why delay, add a comment at least for that
drivers/clk/qcom/gcc-sdx65.c line 1001
Quoted 13 lines
drivers/clk/qcom/gcc-sdx65.c new file +13
-0+ .clkr = { + .enable_reg = 0x88004, + .enable_mask = BIT(0), + .hw.init = &(struct clk_init_data ){ + .name ="gcc_pcie_0_clkref_en" , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch gcc_pcie_aux_clk = { + .halt_reg =0x43034 , + .halt_check =BRANCH_HALT_DELAY ,
Here too
Quoted 8 lines
drivers/clk/qcom/gcc-sdx65.c new file +8
-0+static struct clk_branch gcc_pcie_mstr_axi_clk = { + .halt_reg =0x43024 , + .halt_check =BRANCH_HALT_VOTED , + .hwcg_reg =0x43024 , + .hwcg_bit =1 , + .clkr = { + .enable_reg =0x6d010 , + .enable_mask =BIT (1 ),
drivers/clk/qcom/gcc-sdx65.c line 1051
Quoted 10 lines
drivers/clk/qcom/gcc-sdx65.c new file +10
-0+ .hw.init = &(struct clk_init_data){ + .name ="gcc_pcie_mstr_axi_clk" , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch gcc_pcie_pipe_clk = { + .halt_reg =0x4303c , + .halt_check =BRANCH_HALT_DELAY ,
here as well and few more places I guess
drivers/clk/qcom/gcc-sdx65.c line 1410
Quoted 11 lines
drivers/clk/qcom/gcc-sdx65.c new file +11
-0+static struct clk_branch gcc_xo_pcie_link_clk = { + .halt_reg =0x2e008 , + .halt_check =BRANCH_HALT , + .hwcg_reg =0x2e008 , + .hwcg_bit =1 , + .clkr = { + .enable_reg =0x2e008 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="gcc_xo_pcie_link_clk" , + .flags =CLK_IS_CRITICAL ,
Here as well
Signature · 1 line
~Vinod
Re: [PATCH v4 3/6] clk: qcom: Add SDX65 GCC support
Quoted 9 lines · Vinod Koul
Quoted 6 lines · On 15-11-21, 23:38, [email protected] wrote:
From: Vamsi Krishna Lanka <[email protected]>
Add Global Clock Controller (GCC) support for SDX65 SoCs from Qualcomm.
Signed-off-by Vamsi Krishna Lanka <[email protected]>Reported-by kernel test robot <[email protected]>Missing support reported ??
Not mising support but it reported to delete unused varaibles and after the fix mentioned to add the reported tag.
Quoted 15 lines
drivers/clk/qcom/gcc-sdx65.c line 671
Quoted 12 lines
drivers/clk/qcom/gcc-sdx65.c new file +11
-0+static struct clk_branch gcc_ahb_pcie_link_clk = { + .halt_reg =0x2e004 , + .halt_check =BRANCH_HALT , + .clkr = { + .enable_reg =0x2e004 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="gcc_ahb_pcie_link_clk" , + .flags =CLK_IS_CRITICAL , + .ops = &clk_branch2_ops, + },If this clk is critical then why model in linux, enable directly in probe and leave it...?
Yes, actually i have the code which is enabling it directly inside the probe function. so i will remove it here.
Quoted 6 lines
drivers/clk/qcom/gcc-sdx65.c line 988
Quoted 4 lines
drivers/clk/qcom/gcc-sdx65.c new file +3
-0+static struct clk_branch gcc_pcie_0_clkref_en = { + .halt_reg =0x88004 , + .halt_check =BRANCH_HALT_DELAY ,Why delay, add a comment at least for that
sure, will do
Quoted 7 lines
Quoted 7 lines
drivers/clk/qcom/gcc-sdx65.c new file +7
-0+ .clkr = { + .enable_reg = 0x88004, + .enable_mask = BIT(0), + .hw.init = &(struct clk_init_data ){ + .name ="gcc_pcie_0_clkref_en" , + .ops = &clk_branch2_ops, + },
Quoted 8 lines
drivers/clk/qcom/gcc-sdx65.c line 1001
Quoted 6 lines
drivers/clk/qcom/gcc-sdx65.c new file +6
-0+ }, +}; + +static struct clk_branch gcc_pcie_aux_clk = { + .halt_reg =0x43034 , + .halt_check =BRANCH_HALT_DELAY ,Here too
will do.
Quoted 22 lines
Quoted 9 lines
drivers/clk/qcom/gcc-sdx65.c new file +8
-0+static struct clk_branch gcc_pcie_mstr_axi_clk = { + .halt_reg =0x43024 , + .halt_check =BRANCH_HALT_VOTED , + .hwcg_reg =0x43024 , + .hwcg_bit =1 , + .clkr = { + .enable_reg =0x6d010 , + .enable_mask =BIT (1 ),drivers/clk/qcom/gcc-sdx65.c line 1051
Quoted 10 lines
drivers/clk/qcom/gcc-sdx65.c new file +10
-0+ .hw.init = &(struct clk_init_data){ + .name ="gcc_pcie_mstr_axi_clk" , + .ops = &clk_branch2_ops, + }, + }, +}; + +static struct clk_branch gcc_pcie_pipe_clk = { + .halt_reg =0x4303c , + .halt_check =BRANCH_HALT_DELAY ,here as well and few more places I guess
Quoted 13 lines
drivers/clk/qcom/gcc-sdx65.c line 1410
Quoted 11 lines
drivers/clk/qcom/gcc-sdx65.c new file +11
-0+static struct clk_branch gcc_xo_pcie_link_clk = { + .halt_reg =0x2e008 , + .halt_check =BRANCH_HALT , + .hwcg_reg =0x2e008 , + .hwcg_bit =1 , + .clkr = { + .enable_reg =0x2e008 , + .enable_mask =BIT (0 ), + .hw.init = &(struct clk_init_data ){ + .name ="gcc_xo_pcie_link_clk" , + .flags =CLK_IS_CRITICAL ,Here as well
Same as above.
Quoted 2 lines
Signature · 1 line
~Vinod
Re: [PATCH v4 3/6] clk: qcom: Add SDX65 GCC support
Quoted 6 lines · Vamsi Krishna Lanka
Quoted 5 lines · Vinod Koul
Quoted 4 lines · On 15-11-21, 23:38, [email protected] wrote:
From: Vamsi Krishna Lanka <[email protected]>
Add Global Clock Controller (GCC) support for SDX65 SoCs from Qualcomm.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Vamsi Krishna Lanka <[email protected]>Reported-by kernel test robot <[email protected]>Missing support reported ??
Not mising support but it reported to delete unused varaibles and after the fix mentioned to add the reported tag.
I think it does not make sense here, you may add a note in changelog that you fixed issues reported by kbot
Signature · 1 line
~Vinod
Re: [PATCH v4 3/6] clk: qcom: Add SDX65 GCC support
Quoted 10 lines · Vinod Koul
Quoted 9 lines · Vamsi Krishna Lanka
Quoted 8 lines · Vinod Koul
Quoted 6 lines · On 15-11-21, 23:38, [email protected] wrote:
From: Vamsi Krishna Lanka <[email protected]>
Add Global Clock Controller (GCC) support for SDX65 SoCs from Qualcomm.
Signed-off-by Vamsi Krishna Lanka <[email protected]>Reported-by kernel test robot <[email protected]>
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Missing support reported ??
Not mising support but it reported to delete unused varaibles and after the fix mentioned to add the reported tag.
I think it does not make sense here, you may add a note in changelog that you fixed issues reported by kbot
I mentioned that in the cover letter and thought that is sufficient.
Quoted 2 lines
Signature · 1 line
~Vinod
Re: [PATCH v4 3/6] clk: qcom: Add SDX65 GCC support
Quoted 13 lines · Vamsi Krishna Lanka
Quoted 12 lines · Vinod Koul
Quoted 11 lines · Vamsi Krishna Lanka
Quoted 9 lines · Vinod Koul
Quoted 6 lines · On 15-11-21, 23:38, [email protected] wrote:
From: Vamsi Krishna Lanka <[email protected]>
Add Global Clock Controller (GCC) support for SDX65 SoCs from Qualcomm.
Signed-off-by Vamsi Krishna Lanka <[email protected]>Reported-by kernel test robot <[email protected]>Missing support reported ??
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Not mising support but it reported to delete unused varaibles and after the fix mentioned to add the reported tag.
I think it does not make sense here, you may add a note in changelog that you fixed issues reported by kbot
I mentioned that in the cover letter and thought that is sufficient.
Yes that should be.
Signature · 1 line
~Vinod
PATCH v4 4/6 dt-bindings: clock: Introduce RPMHCC bindings for SDX65
In reply to [email protected]From: Vamsi krishna Lanka <[email protected]>
Add compatible for SDX65 RPMHCC.
--- Documentation/devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/clock/qcom,rpmhcc.yaml +1 -0
@@ -22,6 +22,7 @@ properties: - qcom,sc8180x-rpmh-clk - qcom,sdm845-rpmh-clk - qcom,sdx55-rpmh-clk + - qcom,sdx65-rpmh-clk - qcom,sm6350-rpmh-clk - qcom,sm8150-rpmh-clk - qcom,sm8250-rpmh-clk
Signature · 1 line
2.33.1
Re: [PATCH v4 4/6] dt-bindings: clock: Introduce RPMHCC bindings for SDX65
Quoted 3 lines · On 15-11-21, 23:38, [email protected] wrote:
From: Vamsi krishna Lanka <[email protected]>
Add compatible for SDX65 RPMHCC.
Signature · 1 line
~Vinod
PATCH v4 5/6 clk: qcom: Add support for SDX65 RPMh clocks
In reply to [email protected]From: Vamsi krishna Lanka <[email protected]>
Add support for clocks maintained by RPMh in SDX65 SoCs.
--- drivers/clk/qcom/clk-rpmh.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/clk/qcom/clk-rpmh.c +25 -0
@@ -556,6 +556,30 @@ static const struct clk_rpmh_desc clk_rpmh_sm6350 = { .num_clks = ARRAY_SIZE(sm6350_rpmh_clocks), }; +DEFINE_CLK_RPMH_VRM (sdx65, ln_bb_clk1, ln_bb_clk1_ao,"lnbclka1" ,4 ); + +static struct clk_hw *sdx65_rpmh_clocks[] = { + [RPMH_CXO_CLK ] = &sc7280_bi_tcxo.hw, + [RPMH_CXO_CLK_A ] = &sc7280_bi_tcxo_ao.hw, + [RPMH_LN_BB_CLK1 ] = &sdx65_ln_bb_clk1.hw, + [RPMH_LN_BB_CLK1_A ] = &sdx65_ln_bb_clk1_ao.hw, + [RPMH_RF_CLK1 ] = &sdm845_rf_clk1.hw, + [RPMH_RF_CLK1_A ] = &sdm845_rf_clk1_ao.hw, + [RPMH_RF_CLK2 ] = &sdm845_rf_clk2.hw, + [RPMH_RF_CLK2_A ] = &sdm845_rf_clk2_ao.hw, + [RPMH_RF_CLK3 ] = &sdm845_rf_clk3.hw, + [RPMH_RF_CLK3_A ] = &sdm845_rf_clk3_ao.hw, + [RPMH_RF_CLK4 ] = &sm8350_rf_clk4.hw, + [RPMH_RF_CLK4_A ] = &sm8350_rf_clk4_ao.hw, + [RPMH_IPA_CLK ] = &sdm845_ipa.hw, + [RPMH_QPIC_CLK ] = &sdx55_qpic_clk.hw, +}; + +static const struct clk_rpmh_desc clk_rpmh_sdx65 = { + .clks = sdx65_rpmh_clocks, + .num_clks =ARRAY_SIZE (sdx65_rpmh_clocks), +}; +static struct clk_hw *of_clk_rpmh_hw_get (struct of_phandle_args *clkspec,void *data) {
@@ -643,6 +667,7 @@ static const struct of_device_id clk_rpmh_match_table[] = { { .compatible = "qcom,sc8180x-rpmh-clk", .data = &clk_rpmh_sc8180x}, { .compatible = "qcom,sdm845-rpmh-clk", .data = &clk_rpmh_sdm845}, { .compatible = "qcom,sdx55-rpmh-clk", .data = &clk_rpmh_sdx55}, + { .compatible = "qcom,sdx65-rpmh-clk", .data = &clk_rpmh_sdx65}, { .compatible = "qcom,sm6350-rpmh-clk", .data = &clk_rpmh_sm6350}, { .compatible = "qcom,sm8150-rpmh-clk", .data = &clk_rpmh_sm8150}, { .compatible = "qcom,sm8250-rpmh-clk", .data = &clk_rpmh_sm8250},
Signature · 1 line
2.33.1
Re: [PATCH v4 5/6] clk: qcom: Add support for SDX65 RPMh clocks
Quoted 3 lines · On 15-11-21, 23:38, [email protected] wrote:
From: Vamsi krishna Lanka <[email protected]>
Add support for clocks maintained by RPMh in SDX65 SoCs.
Quoted 52 lines
Signed-off-by Vamsi Krishna Lanka <[email protected]>Acked-by Bjorn Andersson <[email protected]>--- drivers/clk/qcom/clk-rpmh.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)drivers/clk/qcom/clk-rpmh.c +25
-0@@ -556,6 +556,30 @@ static const struct clk_rpmh_desc clk_rpmh_sm6350 = { .num_clks = ARRAY_SIZE(sm6350_rpmh_clocks), }; +DEFINE_CLK_RPMH_VRM (sdx65, ln_bb_clk1, ln_bb_clk1_ao,"lnbclka1" ,4 ); + +static struct clk_hw *sdx65_rpmh_clocks[] = { + [RPMH_CXO_CLK ] = &sc7280_bi_tcxo.hw, + [RPMH_CXO_CLK_A ] = &sc7280_bi_tcxo_ao.hw, + [RPMH_LN_BB_CLK1 ] = &sdx65_ln_bb_clk1.hw, + [RPMH_LN_BB_CLK1_A ] = &sdx65_ln_bb_clk1_ao.hw, + [RPMH_RF_CLK1 ] = &sdm845_rf_clk1.hw, + [RPMH_RF_CLK1_A ] = &sdm845_rf_clk1_ao.hw, + [RPMH_RF_CLK2 ] = &sdm845_rf_clk2.hw, + [RPMH_RF_CLK2_A ] = &sdm845_rf_clk2_ao.hw, + [RPMH_RF_CLK3 ] = &sdm845_rf_clk3.hw, + [RPMH_RF_CLK3_A ] = &sdm845_rf_clk3_ao.hw, + [RPMH_RF_CLK4 ] = &sm8350_rf_clk4.hw, + [RPMH_RF_CLK4_A ] = &sm8350_rf_clk4_ao.hw, + [RPMH_IPA_CLK ] = &sdm845_ipa.hw, + [RPMH_QPIC_CLK ] = &sdx55_qpic_clk.hw, +}; + +static const struct clk_rpmh_desc clk_rpmh_sdx65 = { + .clks = sdx65_rpmh_clocks, + .num_clks =ARRAY_SIZE (sdx65_rpmh_clocks), +}; +static struct clk_hw *of_clk_rpmh_hw_get (struct of_phandle_args *clkspec,void *data) {@@ -643,6 +667,7 @@ static const struct of_device_id clk_rpmh_match_table[] = { { .compatible = "qcom,sc8180x-rpmh-clk", .data = &clk_rpmh_sc8180x}, { .compatible = "qcom,sdm845-rpmh-clk", .data = &clk_rpmh_sdm845}, { .compatible = "qcom,sdx55-rpmh-clk", .data = &clk_rpmh_sdx55}, + { .compatible = "qcom,sdx65-rpmh-clk", .data = &clk_rpmh_sdx65}, { .compatible = "qcom,sm6350-rpmh-clk", .data = &clk_rpmh_sm6350}, { .compatible = "qcom,sm8150-rpmh-clk", .data = &clk_rpmh_sm8150}, { .compatible = "qcom,sm8250-rpmh-clk", .data = &clk_rpmh_sm8250},Signature · 1 line
2.33.1
Signature · 1 line
~Vinod
PATCH v4 6/6 dt-bindings: clock: Introduce pdc bindings for SDX65
In reply to [email protected]From: Vamsi Krishna Lanka <[email protected]>
Add compatible for SDX65 pdc.
--- .../devicetree/bindings/interrupt-controller/qcom,pdc.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt +1 -0
@@ -23,6 +23,7 @@ Properties: - "qcom,sdm845-pdc": For SDM845 - "qcom,sdm8250-pdc": For SM8250 - "qcom,sdm8350-pdc": For SM8350 + - "qcom,sdx65-pdc": For SDX65 - reg: Usage: required
Signature · 1 line
2.33.1
Re: [PATCH v4 6/6] dt-bindings: clock: Introduce pdc bindings for SDX65
Quoted 3 lines · On 15-11-21, 23:38, [email protected] wrote:
From: Vamsi Krishna Lanka <[email protected]>
Add compatible for SDX65 pdc.
Quoted 22 lines
Signed-off-by Vamsi Krishna Lanka <[email protected]>Reviewed-by Bjorn Andersson <[email protected]>Acked-by Rob Herring <[email protected]>--- .../devicetree/bindings/interrupt-controller/qcom,pdc.txt | 1 + 1 file changed, 1 insertion(+)Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt +1
-0@@ -23,6 +23,7 @@ Properties: - "qcom,sdm845-pdc": For SDM845 - "qcom,sdm8250-pdc": For SM8250 - "qcom,sdm8350-pdc": For SM8350 + - "qcom,sdx65-pdc": For SDX65 - reg: Usage: requiredSignature · 1 line
2.33.1
Signature · 1 line
~Vinod
Quoted 10 lines · On 15-11-21, 23:38, [email protected] wrote:
From: Vamsi Krishna Lanka <[email protected]>
Hello,
Changes from v3:
- Fixed DTbindings and unused varaibles errors reported by kernel test bot
- Rebased on top of v5.16-rc1Changes from v2:
- Addressed Taniya Das and Vinod Koul's comments related to addingLUCID_EVO
Ah wasnt aware the comments are fixed. It is a good practice to reply to reviewers about the comments
Quoted 32 lines
PLL type and rpmh support patches
- Collected Rob's Acked-by for the dt-bindings patchesChanges from v1:
- Addressed Bjorn's comments related to the GCC support patch
- Collected Bjorn's and Rob's Reviewed-by for the dt-bindings patchesThis patch series adds bindings and device driver changes for GCC, pdc and RPMh clock support for SDX65 Platform.
Thanks,
Vamsi.../bindings/clock/qcom,gcc-sdx65.yaml | 78 + .../bindings/clock/qcom,rpmhcc.yaml | 1 + .../interrupt-controller/qcom,pdc.txt | 1 + drivers/clk/qcom/Kconfig | 8 + drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/clk-alpha-pll.c | 171 ++ drivers/clk/qcom/clk-alpha-pll.h | 3 + drivers/clk/qcom/clk-rpmh.c | 25 + drivers/clk/qcom/gcc-sdx65.c | 1589 +++++++++++++++++ include/dt-bindings/clock/qcom,gcc-sdx65.h | 122 ++ 10 files changed, 1999 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sdx65.yaml create mode 100644 drivers/clk/qcom/gcc-sdx65.c create mode 100644 include/dt-bindings/clock/qcom,gcc-sdx65.hbase-commit:
8ab774587903771821b59471cc723bba6d893942Signature · 1 line
2.33.1
Signature · 1 line
~Vinod