This is an automatically generated commit which aids following Kernel patch history, as git will see the move and copy as a rename thus defeating the purpose. For the original discussion see: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html Signed-off-by: Julius Bairaktaris <julius@bairaktaris.de> Link: https://github.com/openwrt/openwrt/pull/24031 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
104 lines
3.8 KiB
Diff
104 lines
3.8 KiB
Diff
From a2afa4c33f0a7f7f70d54a1bc5110e326753f982 Mon Sep 17 00:00:00 2001
|
|
From: Luo Jie <quic_luoj@quicinc.com>
|
|
Date: Tue, 10 Jun 2025 18:35:19 +0800
|
|
Subject: clk: qcom: cmnpll: Add IPQ5424 SoC support
|
|
|
|
The CMN PLL in IPQ5424 SoC supplies the fixed clock to NSS at 300 MHZ
|
|
and to PPE at 375 MHZ. Other output clocks from CMN PLL on this SoC,
|
|
and their rates are same as IPQ9574.
|
|
|
|
Acked-by: Stephen Boyd <sboyd@kernel.org>
|
|
Signed-off-by: Luo Jie <quic_luoj@quicinc.com>
|
|
Link: https://lore.kernel.org/r/20250610-qcom_ipq5424_cmnpll-v3-2-ceada8165645@quicinc.com
|
|
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|
---
|
|
drivers/clk/qcom/ipq-cmn-pll.c | 35 ++++++++++++++++++++++++++++++-----
|
|
1 file changed, 30 insertions(+), 5 deletions(-)
|
|
|
|
(limited to 'drivers/clk/qcom/ipq-cmn-pll.c')
|
|
|
|
--- a/drivers/clk/qcom/ipq-cmn-pll.c
|
|
+++ b/drivers/clk/qcom/ipq-cmn-pll.c
|
|
@@ -1,6 +1,6 @@
|
|
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
|
+ * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
|
*/
|
|
|
|
/*
|
|
@@ -16,6 +16,10 @@
|
|
* are supplied to GCC (24 MHZ as XO and 32 KHZ as sleep clock), and to PCS
|
|
* with 31.25 MHZ.
|
|
*
|
|
+ * On the IPQ5424 SoC, there is an output clock from CMN PLL to PPE at 375 MHZ,
|
|
+ * and an output clock to NSS (network subsystem) at 300 MHZ. The other output
|
|
+ * clocks from CMN PLL on IPQ5424 are the same as IPQ9574.
|
|
+ *
|
|
* +---------+
|
|
* | GCC |
|
|
* +--+---+--+
|
|
@@ -46,6 +50,7 @@
|
|
#include <linux/regmap.h>
|
|
|
|
#include <dt-bindings/clock/qcom,ipq-cmn-pll.h>
|
|
+#include <dt-bindings/clock/qcom,ipq5424-cmn-pll.h>
|
|
|
|
#define CMN_PLL_REFCLK_SRC_SELECTION 0x28
|
|
#define CMN_PLL_REFCLK_SRC_DIV GENMASK(9, 8)
|
|
@@ -115,6 +120,20 @@ static const struct cmn_pll_fixed_output
|
|
CLK_PLL_OUTPUT(ETH1_50MHZ_CLK, "eth1-50mhz", 50000000UL),
|
|
CLK_PLL_OUTPUT(ETH2_50MHZ_CLK, "eth2-50mhz", 50000000UL),
|
|
CLK_PLL_OUTPUT(ETH_25MHZ_CLK, "eth-25mhz", 25000000UL),
|
|
+ { /* Sentinel */ }
|
|
+};
|
|
+
|
|
+static const struct cmn_pll_fixed_output_clk ipq5424_output_clks[] = {
|
|
+ CLK_PLL_OUTPUT(IPQ5424_XO_24MHZ_CLK, "xo-24mhz", 24000000UL),
|
|
+ CLK_PLL_OUTPUT(IPQ5424_SLEEP_32KHZ_CLK, "sleep-32khz", 32000UL),
|
|
+ CLK_PLL_OUTPUT(IPQ5424_PCS_31P25MHZ_CLK, "pcs-31p25mhz", 31250000UL),
|
|
+ CLK_PLL_OUTPUT(IPQ5424_NSS_300MHZ_CLK, "nss-300mhz", 300000000UL),
|
|
+ CLK_PLL_OUTPUT(IPQ5424_PPE_375MHZ_CLK, "ppe-375mhz", 375000000UL),
|
|
+ CLK_PLL_OUTPUT(IPQ5424_ETH0_50MHZ_CLK, "eth0-50mhz", 50000000UL),
|
|
+ CLK_PLL_OUTPUT(IPQ5424_ETH1_50MHZ_CLK, "eth1-50mhz", 50000000UL),
|
|
+ CLK_PLL_OUTPUT(IPQ5424_ETH2_50MHZ_CLK, "eth2-50mhz", 50000000UL),
|
|
+ CLK_PLL_OUTPUT(IPQ5424_ETH_25MHZ_CLK, "eth-25mhz", 25000000UL),
|
|
+ { /* Sentinel */ }
|
|
};
|
|
|
|
/*
|
|
@@ -297,7 +316,7 @@ static struct clk_hw *ipq_cmn_pll_clk_hw
|
|
|
|
static int ipq_cmn_pll_register_clks(struct platform_device *pdev)
|
|
{
|
|
- const struct cmn_pll_fixed_output_clk *fixed_clk;
|
|
+ const struct cmn_pll_fixed_output_clk *p, *fixed_clk;
|
|
struct clk_hw_onecell_data *hw_data;
|
|
struct device *dev = &pdev->dev;
|
|
struct clk_hw *cmn_pll_hw;
|
|
@@ -305,8 +324,13 @@ static int ipq_cmn_pll_register_clks(str
|
|
struct clk_hw *hw;
|
|
int ret, i;
|
|
|
|
- fixed_clk = ipq9574_output_clks;
|
|
- num_clks = ARRAY_SIZE(ipq9574_output_clks);
|
|
+ fixed_clk = device_get_match_data(dev);
|
|
+ if (!fixed_clk)
|
|
+ return -EINVAL;
|
|
+
|
|
+ num_clks = 0;
|
|
+ for (p = fixed_clk; p->name; p++)
|
|
+ num_clks++;
|
|
|
|
hw_data = devm_kzalloc(dev, struct_size(hw_data, hws, num_clks + 1),
|
|
GFP_KERNEL);
|
|
@@ -415,7 +439,8 @@ static const struct dev_pm_ops ipq_cmn_p
|
|
};
|
|
|
|
static const struct of_device_id ipq_cmn_pll_clk_ids[] = {
|
|
- { .compatible = "qcom,ipq9574-cmn-pll", },
|
|
+ { .compatible = "qcom,ipq9574-cmn-pll", .data = &ipq9574_output_clks },
|
|
+ { .compatible = "qcom,ipq5424-cmn-pll", .data = &ipq5424_output_clks },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, ipq_cmn_pll_clk_ids);
|