hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'clk-fixed-rate-remove' and 'clk-qcom-cleanup' into clk-next 

* clk-fixed-rate-remove:
  clk: fixed-rate: fix of_node_get-put imbalance

* clk-qcom-cleanup:
  clk: qcom: Remove unused arrays in SDM845 GCC
This commit is contained in:
Stephen Boyd 2018-10-18 15:44:13 -07:00
parent 1578968f77 52091c256b 82a4de6f11
commit 9a1d6b232b
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/clk/clk-fixed-rate.c
View File

@ -200,6 +200,7 @@ static int of_fixed_clk_remove(struct platform_device *pdev)
{ {
struct clk *clk = platform_get_drvdata(pdev); struct clk *clk = platform_get_drvdata(pdev);
of_clk_del_provider(pdev->dev.of_node);
clk_unregister_fixed_rate(clk); clk_unregister_fixed_rate(clk);
return 0; return 0;

16
drivers/clk/qcom/gcc-sdm845.c
View File

@ -99,22 +99,6 @@ static const char * const gcc_parent_names_4[] = {
"core_bi_pll_test_se", "core_bi_pll_test_se",
}; };
static const struct parent_map gcc_parent_map_5[] = {
{ P_BI_TCXO, 0 },
{ P_GPLL0_OUT_MAIN, 1 },
{ P_GPLL4_OUT_MAIN, 5 },
{ P_GPLL0_OUT_EVEN, 6 },
{ P_CORE_BI_PLL_TEST_SE, 7 },
};
static const char * const gcc_parent_names_5[] = {
"bi_tcxo",
"gpll0",
"gpll4",
"gpll0_out_even",
"core_bi_pll_test_se",
};
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_GPLL0_OUT_MAIN, 1 }, { P_GPLL0_OUT_MAIN, 1 },