Commit 1a500e0b authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson

clk: qcom: gcc-sm8350: fix PCIe PIPE clocks handling

On SM8350 platform the PCIe PIPE clocks require additional handling to
function correctly. They are to be switched to the tcxo source before
turning PCIe GDSCs off and should be switched to PHY PIPE source once
they are working. Switch PCIe PHY clocks to use clk_regmap_phy_mux_ops,
which provide support for this dance.

Fixes: 44c20c9e ("clk: qcom: gcc: Add clock driver for SM8350")
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230412134829.3686467-1-dmitry.baryshkov@linaro.org
parent aad09fc7
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "clk-regmap.h" #include "clk-regmap.h"
#include "clk-regmap-divider.h" #include "clk-regmap-divider.h"
#include "clk-regmap-mux.h" #include "clk-regmap-mux.h"
#include "clk-regmap-phy-mux.h"
#include "gdsc.h" #include "gdsc.h"
#include "reset.h" #include "reset.h"
...@@ -158,26 +159,6 @@ static const struct clk_parent_data gcc_parent_data_3[] = { ...@@ -158,26 +159,6 @@ static const struct clk_parent_data gcc_parent_data_3[] = {
{ .fw_name = "bi_tcxo" }, { .fw_name = "bi_tcxo" },
}; };
static const struct parent_map gcc_parent_map_4[] = {
{ P_PCIE_0_PIPE_CLK, 0 },
{ P_BI_TCXO, 2 },
};
static const struct clk_parent_data gcc_parent_data_4[] = {
{ .fw_name = "pcie_0_pipe_clk", },
{ .fw_name = "bi_tcxo" },
};
static const struct parent_map gcc_parent_map_5[] = {
{ P_PCIE_1_PIPE_CLK, 0 },
{ P_BI_TCXO, 2 },
};
static const struct clk_parent_data gcc_parent_data_5[] = {
{ .fw_name = "pcie_1_pipe_clk" },
{ .fw_name = "bi_tcxo" },
};
static const struct parent_map gcc_parent_map_6[] = { static const struct parent_map gcc_parent_map_6[] = {
{ P_BI_TCXO, 0 }, { P_BI_TCXO, 0 },
{ P_GCC_GPLL0_OUT_MAIN, 1 }, { P_GCC_GPLL0_OUT_MAIN, 1 },
...@@ -274,32 +255,30 @@ static const struct clk_parent_data gcc_parent_data_14[] = { ...@@ -274,32 +255,30 @@ static const struct clk_parent_data gcc_parent_data_14[] = {
{ .fw_name = "bi_tcxo" }, { .fw_name = "bi_tcxo" },
}; };
static struct clk_regmap_mux gcc_pcie_0_pipe_clk_src = { static struct clk_regmap_phy_mux gcc_pcie_0_pipe_clk_src = {
.reg = 0x6b054, .reg = 0x6b054,
.shift = 0,
.width = 2,
.parent_map = gcc_parent_map_4,
.clkr = { .clkr = {
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gcc_pcie_0_pipe_clk_src", .name = "gcc_pcie_0_pipe_clk_src",
.parent_data = gcc_parent_data_4, .parent_data = &(const struct clk_parent_data){
.num_parents = ARRAY_SIZE(gcc_parent_data_4), .fw_name = "pcie_0_pipe_clk",
.ops = &clk_regmap_mux_closest_ops, },
.num_parents = 1,
.ops = &clk_regmap_phy_mux_ops,
}, },
}, },
}; };
static struct clk_regmap_mux gcc_pcie_1_pipe_clk_src = { static struct clk_regmap_phy_mux gcc_pcie_1_pipe_clk_src = {
.reg = 0x8d054, .reg = 0x8d054,
.shift = 0,
.width = 2,
.parent_map = gcc_parent_map_5,
.clkr = { .clkr = {
.hw.init = &(struct clk_init_data){ .hw.init = &(struct clk_init_data){
.name = "gcc_pcie_1_pipe_clk_src", .name = "gcc_pcie_1_pipe_clk_src",
.parent_data = gcc_parent_data_5, .parent_data = &(const struct clk_parent_data){
.num_parents = ARRAY_SIZE(gcc_parent_data_5), .fw_name = "pcie_1_pipe_clk",
.ops = &clk_regmap_mux_closest_ops, },
.num_parents = 1,
.ops = &clk_regmap_phy_mux_ops,
}, },
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment