cmn_refclk_<p/m> lines in Torrent SERDES is used for connecting external
reference clock. cmn_refclk_<p/m> can also be configured to output the
reference clock. In order to drive the refclk out from the SERDES
(Cadence Torrent), PHY_EN_REFCLK should be set in SERDES_RST of WIZ.
Model PHY_EN_REFCLK as a clock, so that platforms like AM642 EVM can
enable it.
Signed-off-by: Kishon Vijay Abraham I <[email protected]>
---
drivers/phy/ti/phy-j721e-wiz.c | 115 +++++++++++++++++++++++++++++++++
1 file changed, 115 insertions(+)
diff --git a/drivers/phy/ti/phy-j721e-wiz.c b/drivers/phy/ti/phy-j721e-wiz.c
index 08acfab1ebe6..d60a9a01a8b2 100644
--- a/drivers/phy/ti/phy-j721e-wiz.c
+++ b/drivers/phy/ti/phy-j721e-wiz.c
@@ -54,6 +54,7 @@ enum wiz_refclk_div_sel {
static const struct reg_field por_en = REG_FIELD(WIZ_SERDES_CTRL, 31, 31);
static const struct reg_field phy_reset_n = REG_FIELD(WIZ_SERDES_RST, 31, 31);
+static const struct reg_field phy_en_refclk = REG_FIELD(WIZ_SERDES_RST, 30, 30);
static const struct reg_field pll1_refclk_mux_sel =
REG_FIELD(WIZ_SERDES_RST, 29, 29);
static const struct reg_field pll0_refclk_mux_sel =
@@ -141,6 +142,15 @@ struct wiz_clk_div_sel {
const char *node_name;
};
+struct wiz_phy_en_refclk {
+ struct clk_hw hw;
+ struct regmap_field *phy_en_refclk;
+ struct clk_init_data clk_data;
+};
+
+#define to_wiz_phy_en_refclk(_hw) \
+ container_of(_hw, struct wiz_phy_en_refclk, hw)
+
static struct wiz_clk_mux_sel clk_mux_sel_16g[] = {
{
/*
@@ -214,6 +224,7 @@ struct wiz {
unsigned int clk_div_sel_num;
struct regmap_field *por_en;
struct regmap_field *phy_reset_n;
+ struct regmap_field *phy_en_refclk;
struct regmap_field *p_enable[WIZ_MAX_LANES];
struct regmap_field *p_align[WIZ_MAX_LANES];
struct regmap_field *p_raw_auto_start[WIZ_MAX_LANES];
@@ -450,9 +461,96 @@ static int wiz_regfield_init(struct wiz *wiz)
return PTR_ERR(wiz->typec_ln10_swap);
}
+ wiz->phy_en_refclk = devm_regmap_field_alloc(dev, regmap,
+ phy_en_refclk);
+ if (IS_ERR(wiz->phy_en_refclk)) {
+ dev_err(dev, "PHY_EN_REFCLK reg field init failed\n");
+ return PTR_ERR(wiz->phy_en_refclk);
+ }
+
return 0;
}
+static int wiz_phy_en_refclk_enable(struct clk_hw *hw)
+{
+ struct wiz_phy_en_refclk *wiz_phy_en_refclk = to_wiz_phy_en_refclk(hw);
+ struct regmap_field *phy_en_refclk = wiz_phy_en_refclk->phy_en_refclk;
+
+ regmap_field_write(phy_en_refclk, 1);
+
+ return 0;
+}
+
+static void wiz_phy_en_refclk_disable(struct clk_hw *hw)
+{
+ struct wiz_phy_en_refclk *wiz_phy_en_refclk = to_wiz_phy_en_refclk(hw);
+ struct regmap_field *phy_en_refclk = wiz_phy_en_refclk->phy_en_refclk;
+
+ regmap_field_write(phy_en_refclk, 0);
+}
+
+static int wiz_phy_en_refclk_is_enabled(struct clk_hw *hw)
+{
+ struct wiz_phy_en_refclk *wiz_phy_en_refclk = to_wiz_phy_en_refclk(hw);
+ struct regmap_field *phy_en_refclk = wiz_phy_en_refclk->phy_en_refclk;
+ int val;
+
+ regmap_field_read(phy_en_refclk, &val);
+
+ return !!val;
+}
+
+static const struct clk_ops wiz_phy_en_refclk_ops = {
+ .enable = wiz_phy_en_refclk_enable,
+ .disable = wiz_phy_en_refclk_disable,
+ .is_enabled = wiz_phy_en_refclk_is_enabled,
+};
+
+static int wiz_phy_en_refclk_register(struct wiz *wiz, struct device_node *node,
+ struct regmap_field *phy_en_refclk)
+{
+ struct wiz_phy_en_refclk *wiz_phy_en_refclk;
+ struct device *dev = wiz->dev;
+ struct clk_init_data *init;
+ unsigned int num_parents;
+ const char *parent_name;
+ char clk_name[100];
+ struct clk *clk;
+ int ret;
+
+ wiz_phy_en_refclk = devm_kzalloc(dev, sizeof(*wiz_phy_en_refclk),
+ GFP_KERNEL);
+ if (!wiz_phy_en_refclk)
+ return -ENOMEM;
+
+ num_parents = of_clk_get_parent_count(node);
+ parent_name = of_clk_get_parent_name(node, 0);
+
+ snprintf(clk_name, sizeof(clk_name), "%s_%s", dev_name(dev),
+ node->name);
+
+ init = &wiz_phy_en_refclk->clk_data;
+
+ init->ops = &wiz_phy_en_refclk_ops;
+ init->flags = 0;
+ init->parent_names = parent_name ? &parent_name : NULL;
+ init->num_parents = num_parents ? 1 : 0;
+ init->name = clk_name;
+
+ wiz_phy_en_refclk->phy_en_refclk = phy_en_refclk;
+ wiz_phy_en_refclk->hw.init = init;
+
+ clk = devm_clk_register(dev, &wiz_phy_en_refclk->hw);
+ if (IS_ERR(clk))
+ return PTR_ERR(clk);
+
+ ret = of_clk_add_provider(node, of_clk_src_simple_get, clk);
+ if (ret)
+ dev_err(dev, "Fail to add clock provider: %s\n", clk_name);
+
+ return ret;
+}
+
static u8 wiz_clk_mux_get_parent(struct clk_hw *hw)
{
struct wiz_clk_mux *mux = to_wiz_clk_mux(hw);
@@ -713,6 +811,20 @@ static int wiz_clock_init(struct wiz *wiz, struct device_node *node)
of_node_put(clk_node);
}
+ clk_node = of_get_child_by_name(node, "phy-en-refclk");
+ if (clk_node) {
+ ret = wiz_phy_en_refclk_register(wiz, clk_node,
+ wiz->phy_en_refclk);
+ if (ret) {
+ dev_err(dev, "Failed to register %s clock\n",
+ node_name);
+ of_node_put(clk_node);
+ goto err;
+ }
+
+ of_node_put(clk_node);
+ }
+
return 0;
err:
wiz_clock_cleanup(wiz, node);
@@ -828,6 +940,9 @@ static int wiz_get_lane_phy_types(struct device *dev, struct wiz *wiz)
of_node_name_eq(subnode, "link")))
continue;
+ if (!(of_node_name_eq(subnode, "link")))
+ continue;
+
ret = of_property_read_u32(subnode, "reg", ®);
if (ret) {
dev_err(dev,
--
2.17.1
On 24-12-20, 17:12, Kishon Vijay Abraham I wrote:
> cmn_refclk_<p/m> lines in Torrent SERDES is used for connecting external
> reference clock. cmn_refclk_<p/m> can also be configured to output the
> reference clock. In order to drive the refclk out from the SERDES
> (Cadence Torrent), PHY_EN_REFCLK should be set in SERDES_RST of WIZ.
> Model PHY_EN_REFCLK as a clock, so that platforms like AM642 EVM can
> enable it.
>
> Signed-off-by: Kishon Vijay Abraham I <[email protected]>
> ---
> drivers/phy/ti/phy-j721e-wiz.c | 115 +++++++++++++++++++++++++++++++++
> 1 file changed, 115 insertions(+)
>
> diff --git a/drivers/phy/ti/phy-j721e-wiz.c b/drivers/phy/ti/phy-j721e-wiz.c
> index 08acfab1ebe6..d60a9a01a8b2 100644
> --- a/drivers/phy/ti/phy-j721e-wiz.c
> +++ b/drivers/phy/ti/phy-j721e-wiz.c
> @@ -54,6 +54,7 @@ enum wiz_refclk_div_sel {
>
> static const struct reg_field por_en = REG_FIELD(WIZ_SERDES_CTRL, 31, 31);
> static const struct reg_field phy_reset_n = REG_FIELD(WIZ_SERDES_RST, 31, 31);
> +static const struct reg_field phy_en_refclk = REG_FIELD(WIZ_SERDES_RST, 30, 30);
> static const struct reg_field pll1_refclk_mux_sel =
> REG_FIELD(WIZ_SERDES_RST, 29, 29);
> static const struct reg_field pll0_refclk_mux_sel =
> @@ -141,6 +142,15 @@ struct wiz_clk_div_sel {
> const char *node_name;
> };
>
> +struct wiz_phy_en_refclk {
> + struct clk_hw hw;
> + struct regmap_field *phy_en_refclk;
> + struct clk_init_data clk_data;
> +};
> +
> +#define to_wiz_phy_en_refclk(_hw) \
> + container_of(_hw, struct wiz_phy_en_refclk, hw)
> +
> static struct wiz_clk_mux_sel clk_mux_sel_16g[] = {
> {
> /*
> @@ -214,6 +224,7 @@ struct wiz {
> unsigned int clk_div_sel_num;
> struct regmap_field *por_en;
> struct regmap_field *phy_reset_n;
> + struct regmap_field *phy_en_refclk;
> struct regmap_field *p_enable[WIZ_MAX_LANES];
> struct regmap_field *p_align[WIZ_MAX_LANES];
> struct regmap_field *p_raw_auto_start[WIZ_MAX_LANES];
> @@ -450,9 +461,96 @@ static int wiz_regfield_init(struct wiz *wiz)
> return PTR_ERR(wiz->typec_ln10_swap);
> }
>
> + wiz->phy_en_refclk = devm_regmap_field_alloc(dev, regmap,
> + phy_en_refclk);
> + if (IS_ERR(wiz->phy_en_refclk)) {
> + dev_err(dev, "PHY_EN_REFCLK reg field init failed\n");
> + return PTR_ERR(wiz->phy_en_refclk);
> + }
> +
> return 0;
> }
>
> +static int wiz_phy_en_refclk_enable(struct clk_hw *hw)
> +{
> + struct wiz_phy_en_refclk *wiz_phy_en_refclk = to_wiz_phy_en_refclk(hw);
> + struct regmap_field *phy_en_refclk = wiz_phy_en_refclk->phy_en_refclk;
> +
> + regmap_field_write(phy_en_refclk, 1);
> +
> + return 0;
> +}
> +
> +static void wiz_phy_en_refclk_disable(struct clk_hw *hw)
> +{
> + struct wiz_phy_en_refclk *wiz_phy_en_refclk = to_wiz_phy_en_refclk(hw);
> + struct regmap_field *phy_en_refclk = wiz_phy_en_refclk->phy_en_refclk;
> +
> + regmap_field_write(phy_en_refclk, 0);
> +}
> +
> +static int wiz_phy_en_refclk_is_enabled(struct clk_hw *hw)
> +{
> + struct wiz_phy_en_refclk *wiz_phy_en_refclk = to_wiz_phy_en_refclk(hw);
> + struct regmap_field *phy_en_refclk = wiz_phy_en_refclk->phy_en_refclk;
get_phy_wiz_regmap() macro for this repeated patter..?
> + int val;
> +
> + regmap_field_read(phy_en_refclk, &val);
> +
> + return !!val;
> +}
> +
> +static const struct clk_ops wiz_phy_en_refclk_ops = {
> + .enable = wiz_phy_en_refclk_enable,
> + .disable = wiz_phy_en_refclk_disable,
> + .is_enabled = wiz_phy_en_refclk_is_enabled,
> +};
> +
> +static int wiz_phy_en_refclk_register(struct wiz *wiz, struct device_node *node,
> + struct regmap_field *phy_en_refclk)
> +{
> + struct wiz_phy_en_refclk *wiz_phy_en_refclk;
> + struct device *dev = wiz->dev;
> + struct clk_init_data *init;
> + unsigned int num_parents;
> + const char *parent_name;
> + char clk_name[100];
> + struct clk *clk;
> + int ret;
> +
> + wiz_phy_en_refclk = devm_kzalloc(dev, sizeof(*wiz_phy_en_refclk),
> + GFP_KERNEL);
single line :)
> + if (!wiz_phy_en_refclk)
> + return -ENOMEM;
> +
> + num_parents = of_clk_get_parent_count(node);
> + parent_name = of_clk_get_parent_name(node, 0);
> +
> + snprintf(clk_name, sizeof(clk_name), "%s_%s", dev_name(dev),
> + node->name);
here too and few other places
> +
> + init = &wiz_phy_en_refclk->clk_data;
> +
> + init->ops = &wiz_phy_en_refclk_ops;
> + init->flags = 0;
> + init->parent_names = parent_name ? &parent_name : NULL;
> + init->num_parents = num_parents ? 1 : 0;
> + init->name = clk_name;
> +
> + wiz_phy_en_refclk->phy_en_refclk = phy_en_refclk;
> + wiz_phy_en_refclk->hw.init = init;
> +
> + clk = devm_clk_register(dev, &wiz_phy_en_refclk->hw);
> + if (IS_ERR(clk))
> + return PTR_ERR(clk);
> +
> + ret = of_clk_add_provider(node, of_clk_src_simple_get, clk);
> + if (ret)
> + dev_err(dev, "Fail to add clock provider: %s\n", clk_name);
> +
> + return ret;
> +}
> +
> static u8 wiz_clk_mux_get_parent(struct clk_hw *hw)
> {
> struct wiz_clk_mux *mux = to_wiz_clk_mux(hw);
> @@ -713,6 +811,20 @@ static int wiz_clock_init(struct wiz *wiz, struct device_node *node)
> of_node_put(clk_node);
> }
>
> + clk_node = of_get_child_by_name(node, "phy-en-refclk");
> + if (clk_node) {
> + ret = wiz_phy_en_refclk_register(wiz, clk_node,
> + wiz->phy_en_refclk);
> + if (ret) {
> + dev_err(dev, "Failed to register %s clock\n",
> + node_name);
> + of_node_put(clk_node);
> + goto err;
> + }
> +
> + of_node_put(clk_node);
> + }
> +
> return 0;
> err:
> wiz_clock_cleanup(wiz, node);
> @@ -828,6 +940,9 @@ static int wiz_get_lane_phy_types(struct device *dev, struct wiz *wiz)
> of_node_name_eq(subnode, "link")))
> continue;
>
> + if (!(of_node_name_eq(subnode, "link")))
> + continue;
> +
> ret = of_property_read_u32(subnode, "reg", ®);
> if (ret) {
> dev_err(dev,
> --
> 2.17.1
--
~Vinod