mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +00:00
451b51f0dc
Manual adapted the following patches:
generic/hack-5.15/221-module_exports.patch
bcm27xx/patches-5.15/950-0008-drm-vc4-hdmi-Use-a-mutex-to-prevent-concurrent-frame.patch
octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 9693ed6a9e)
153 lines
6.1 KiB
Diff
153 lines
6.1 KiB
Diff
From 78936d46470938caa9a7ea529deeb36777b4f98e Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Wed, 16 Nov 2022 22:46:55 +0100
|
|
Subject: [PATCH] clk: qcom: ipq8074: populate fw_name for all parents
|
|
|
|
It appears that having only .name populated in parent_data for clocks
|
|
which are only globally searchable currently will not work as the clk core
|
|
won't copy that name if there is no .fw_name present as well.
|
|
|
|
So, populate .fw_name for all parent clocks in parent_data.
|
|
|
|
Fixes: ae55ad32e273 ("clk: qcom: ipq8074: convert to parent data")
|
|
|
|
Co-developed-by: Christian Marangi <ansuelsmth@gmail.com>
|
|
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|
Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com
|
|
---
|
|
drivers/clk/qcom/gcc-ipq8074.c | 52 +++++++++++++++++-----------------
|
|
1 file changed, 26 insertions(+), 26 deletions(-)
|
|
|
|
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
|
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
|
@@ -675,7 +675,7 @@ static struct clk_rcg2 pcie0_aux_clk_src
|
|
};
|
|
|
|
static const struct clk_parent_data gcc_pcie20_phy0_pipe_clk_xo[] = {
|
|
- { .name = "pcie20_phy0_pipe_clk" },
|
|
+ { .fw_name = "pcie0_pipe", .name = "pcie20_phy0_pipe_clk" },
|
|
{ .fw_name = "xo", .name = "xo" },
|
|
};
|
|
|
|
@@ -728,7 +728,7 @@ static struct clk_rcg2 pcie1_aux_clk_src
|
|
};
|
|
|
|
static const struct clk_parent_data gcc_pcie20_phy1_pipe_clk_xo[] = {
|
|
- { .name = "pcie20_phy1_pipe_clk" },
|
|
+ { .fw_name = "pcie1_pipe", .name = "pcie20_phy1_pipe_clk" },
|
|
{ .fw_name = "xo", .name = "xo" },
|
|
};
|
|
|
|
@@ -1133,7 +1133,7 @@ static const struct freq_tbl ftbl_nss_no
|
|
|
|
static const struct clk_parent_data gcc_xo_bias_pll_nss_noc_clk_gpll0_gpll2[] = {
|
|
{ .fw_name = "xo", .name = "xo" },
|
|
- { .name = "bias_pll_nss_noc_clk" },
|
|
+ { .fw_name = "bias_pll_nss_noc_clk", .name = "bias_pll_nss_noc_clk" },
|
|
{ .hw = &gpll0.clkr.hw },
|
|
{ .hw = &gpll2.clkr.hw },
|
|
};
|
|
@@ -1358,7 +1358,7 @@ static const struct freq_tbl ftbl_nss_pp
|
|
|
|
static const struct clk_parent_data gcc_xo_bias_gpll0_gpll4_nss_ubi32[] = {
|
|
{ .fw_name = "xo", .name = "xo" },
|
|
- { .name = "bias_pll_cc_clk" },
|
|
+ { .fw_name = "bias_pll_cc_clk", .name = "bias_pll_cc_clk" },
|
|
{ .hw = &gpll0.clkr.hw },
|
|
{ .hw = &gpll4.clkr.hw },
|
|
{ .hw = &nss_crypto_pll.clkr.hw },
|
|
@@ -1409,10 +1409,10 @@ static const struct freq_tbl ftbl_nss_po
|
|
|
|
static const struct clk_parent_data gcc_xo_uniphy0_rx_tx_ubi32_bias[] = {
|
|
{ .fw_name = "xo", .name = "xo" },
|
|
- { .name = "uniphy0_gcc_rx_clk" },
|
|
- { .name = "uniphy0_gcc_tx_clk" },
|
|
+ { .fw_name = "uniphy0_gcc_rx_clk", .name = "uniphy0_gcc_rx_clk" },
|
|
+ { .fw_name = "uniphy0_gcc_tx_clk", .name = "uniphy0_gcc_tx_clk" },
|
|
{ .hw = &ubi32_pll.clkr.hw },
|
|
- { .name = "bias_pll_cc_clk" },
|
|
+ { .fw_name = "bias_pll_cc_clk", .name = "bias_pll_cc_clk" },
|
|
};
|
|
|
|
static const struct parent_map gcc_xo_uniphy0_rx_tx_ubi32_bias_map[] = {
|
|
@@ -1461,10 +1461,10 @@ static const struct freq_tbl ftbl_nss_po
|
|
|
|
static const struct clk_parent_data gcc_xo_uniphy0_tx_rx_ubi32_bias[] = {
|
|
{ .fw_name = "xo", .name = "xo" },
|
|
- { .name = "uniphy0_gcc_tx_clk" },
|
|
- { .name = "uniphy0_gcc_rx_clk" },
|
|
+ { .fw_name = "uniphy0_gcc_tx_clk", .name = "uniphy0_gcc_tx_clk" },
|
|
+ { .fw_name = "uniphy0_gcc_rx_clk", .name = "uniphy0_gcc_rx_clk" },
|
|
{ .hw = &ubi32_pll.clkr.hw },
|
|
- { .name = "bias_pll_cc_clk" },
|
|
+ { .fw_name = "bias_pll_cc_clk", .name = "bias_pll_cc_clk" },
|
|
};
|
|
|
|
static const struct parent_map gcc_xo_uniphy0_tx_rx_ubi32_bias_map[] = {
|
|
@@ -1692,12 +1692,12 @@ static const struct freq_tbl ftbl_nss_po
|
|
|
|
static const struct clk_parent_data gcc_xo_uniphy0_rx_tx_uniphy1_rx_tx_ubi32_bias[] = {
|
|
{ .fw_name = "xo", .name = "xo" },
|
|
- { .name = "uniphy0_gcc_rx_clk" },
|
|
- { .name = "uniphy0_gcc_tx_clk" },
|
|
- { .name = "uniphy1_gcc_rx_clk" },
|
|
- { .name = "uniphy1_gcc_tx_clk" },
|
|
+ { .fw_name = "uniphy0_gcc_rx_clk", .name = "uniphy0_gcc_rx_clk" },
|
|
+ { .fw_name = "uniphy0_gcc_tx_clk", .name = "uniphy0_gcc_tx_clk" },
|
|
+ { .fw_name = "uniphy1_gcc_rx_clk", .name = "uniphy1_gcc_rx_clk" },
|
|
+ { .fw_name = "uniphy1_gcc_tx_clk", .name = "uniphy1_gcc_tx_clk" },
|
|
{ .hw = &ubi32_pll.clkr.hw },
|
|
- { .name = "bias_pll_cc_clk" },
|
|
+ { .fw_name = "bias_pll_cc_clk", .name = "bias_pll_cc_clk" },
|
|
};
|
|
|
|
static const struct parent_map
|
|
@@ -1754,12 +1754,12 @@ static const struct freq_tbl ftbl_nss_po
|
|
|
|
static const struct clk_parent_data gcc_xo_uniphy0_tx_rx_uniphy1_tx_rx_ubi32_bias[] = {
|
|
{ .fw_name = "xo", .name = "xo" },
|
|
- { .name = "uniphy0_gcc_tx_clk" },
|
|
- { .name = "uniphy0_gcc_rx_clk" },
|
|
- { .name = "uniphy1_gcc_tx_clk" },
|
|
- { .name = "uniphy1_gcc_rx_clk" },
|
|
+ { .fw_name = "uniphy0_gcc_tx_clk", .name = "uniphy0_gcc_tx_clk" },
|
|
+ { .fw_name = "uniphy0_gcc_rx_clk", .name = "uniphy0_gcc_rx_clk" },
|
|
+ { .fw_name = "uniphy1_gcc_tx_clk", .name = "uniphy1_gcc_tx_clk" },
|
|
+ { .fw_name = "uniphy1_gcc_rx_clk", .name = "uniphy1_gcc_rx_clk" },
|
|
{ .hw = &ubi32_pll.clkr.hw },
|
|
- { .name = "bias_pll_cc_clk" },
|
|
+ { .fw_name = "bias_pll_cc_clk", .name = "bias_pll_cc_clk" },
|
|
};
|
|
|
|
static const struct parent_map
|
|
@@ -1816,10 +1816,10 @@ static const struct freq_tbl ftbl_nss_po
|
|
|
|
static const struct clk_parent_data gcc_xo_uniphy2_rx_tx_ubi32_bias[] = {
|
|
{ .fw_name = "xo", .name = "xo" },
|
|
- { .name = "uniphy2_gcc_rx_clk" },
|
|
- { .name = "uniphy2_gcc_tx_clk" },
|
|
+ { .fw_name = "uniphy2_gcc_rx_clk", .name = "uniphy2_gcc_rx_clk" },
|
|
+ { .fw_name = "uniphy2_gcc_tx_clk", .name = "uniphy2_gcc_tx_clk" },
|
|
{ .hw = &ubi32_pll.clkr.hw },
|
|
- { .name = "bias_pll_cc_clk" },
|
|
+ { .fw_name = "bias_pll_cc_clk", .name = "bias_pll_cc_clk" },
|
|
};
|
|
|
|
static const struct parent_map gcc_xo_uniphy2_rx_tx_ubi32_bias_map[] = {
|
|
@@ -1873,10 +1873,10 @@ static const struct freq_tbl ftbl_nss_po
|
|
|
|
static const struct clk_parent_data gcc_xo_uniphy2_tx_rx_ubi32_bias[] = {
|
|
{ .fw_name = "xo", .name = "xo" },
|
|
- { .name = "uniphy2_gcc_tx_clk" },
|
|
- { .name = "uniphy2_gcc_rx_clk" },
|
|
+ { .fw_name = "uniphy2_gcc_tx_clk", .name = "uniphy2_gcc_tx_clk" },
|
|
+ { .fw_name = "uniphy2_gcc_rx_clk", .name = "uniphy2_gcc_rx_clk" },
|
|
{ .hw = &ubi32_pll.clkr.hw },
|
|
- { .name = "bias_pll_cc_clk" },
|
|
+ { .fw_name = "bias_pll_cc_clk", .name = "bias_pll_cc_clk" },
|
|
};
|
|
|
|
static const struct parent_map gcc_xo_uniphy2_tx_rx_ubi32_bias_map[] = {
|