clk: introduce (devm_)hw_register_mux_parent_data_table API
Subsystems (3)
PATCH 1/2 clk: introduce (devm_)hw_register_mux_parent_data_table API
Introduce (devm_)hw_register_mux_parent_data_table new API. We have basic support for clk_register_mux using parent_data but we lack any API to provide a custom parent_map. Add these 2 new API to correctly handle these special configuration instead of using the generic __(devm_)clk_hw_register_mux API.
Signed-off-by Christian Marangi <[email protected]>
--- include/linux/clk-provider.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
include/linux/clk-provider.h +14 -0
@@ -955,12 +955,26 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name,__clk_hw_register_mux ((dev),NULL , (name), (num_parents),NULL ,NULL , \ (parent_data), (flags), (reg), (shift), \ BIT((width)) - 1, (clk_mux_flags), NULL, (lock)) +#define clk_hw_register_mux_parent_data_table (dev, name, parent_data, \ + num_parents, flags, reg, shift, \ + width, clk_mux_flags, table, \ + lock) \ + __clk_hw_register_mux((dev), NULL, (name), (num_parents), NULL, NULL, \ + (parent_data), (flags), (reg), (shift), \ + BIT((width)) - 1, (clk_mux_flags), table, (lock))#define devm_clk_hw_register_mux (dev, name, parent_names, num_parents, flags, reg, \ shift, width, clk_mux_flags, lock) \ __devm_clk_hw_register_mux((dev), NULL, (name), (num_parents), \ (parent_names), NULL, NULL, (flags), (reg), \ (shift), BIT((width)) - 1, (clk_mux_flags), \ NULL, (lock)) +#define devm_clk_hw_register_mux_parent_data_table (dev, name, parent_data, \ + num_parents, flags, reg, shift, \ + width, clk_mux_flags, table, \ + lock) \ + __devm_clk_hw_register_mux((dev), NULL, (name), (num_parents), NULL, \ + NULL, (parent_data), (flags), (reg), (shift), \ + BIT((width)) - 1, (clk_mux_flags), table, (lock))int clk_mux_val_to_index (struct clk_hw *hw,const u32 *table,unsigned int flags,unsigned int val);
Signature · 1 line
2.36.1
PATCH 2/2 clk: qcom: kpss-xcc: convert to parent data API
Convert the driver to parent data API. From the Documentation pll8_vote and pxo should be declared in the DTS so fw_name can be used instead of parent_names. Name is still used to save regression on old definition.
Signed-off-by Christian Marangi <[email protected]>
--- drivers/clk/qcom/kpss-xcc.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-)
drivers/clk/qcom/kpss-xcc.c +9 -17
@@ -12,9 +12,9 @@#include <linux/clk.h> #include <linux/clk-provider.h> -static const char *aux_parents[] = { -"pll8_vote" , -"pxo" , +static const struct clk_parent_data aux_parents[] = { + { .name ="pll8_vote" , .fw_name ="pll8_vote" }, + { .name ="pxo" , .fw_name ="pxo" }, };static const u32 aux_parent_map[] = {
@@ -32,8 +32,8 @@ MODULE_DEVICE_TABLE(of, kpss_xcc_match_table);static int kpss_xcc_driver_probe (struct platform_device *pdev) {const struct of_device_id *id; -struct clk *clk;void __iomem *base; +struct clk_hw *hw;const char *name; id =of_match_device (kpss_xcc_match_table, &pdev->dev);
@@ -55,24 +55,16 @@ static int kpss_xcc_driver_probe(struct platform_device *pdev) base +=0x28 ; } - clk =clk_register_mux_table (&pdev->dev, name, aux_parents, -ARRAY_SIZE (aux_parents),0 , base,0 ,0x3 , -0 , aux_parent_map,NULL ); + hw =devm_clk_hw_register_mux_parent_data_table (&pdev->dev, name, aux_parents, +ARRAY_SIZE (aux_parents),0 , + base,0 ,0x3 , +0 , aux_parent_map,NULL ); -platform_set_drvdata (pdev, clk); - -return PTR_ERR_OR_ZERO (clk); -} - -static int kpss_xcc_driver_remove (struct platform_device *pdev) -{ -clk_unregister_mux (platform_get_drvdata (pdev)); -return 0 ; +return PTR_ERR_OR_ZERO (hw); }static struct platform_driver kpss_xcc_driver = { .probe = kpss_xcc_driver_probe, - .remove = kpss_xcc_driver_remove, .driver = { .name ="kpss-xcc" , .of_match_table = kpss_xcc_match_table,
Signature · 1 line
2.36.1