Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a1d6b23 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

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
parents 1578968f 52091c25 82a4de6f

drivers/clk/clk-fixed-rate.c

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ static int of_fixed_clk_remove(struct platform_device *pdev) 
{

	struct clk *clk = platform_get_drvdata(pdev);



	of_clk_del_provider(pdev->dev.of_node);

	clk_unregister_fixed_rate(clk);



	return 0;

drivers/clk/qcom/gcc-sdm845.c

+0 −16
Original line number Diff line number Diff line
@@ -99,22 +99,6 @@ static const char * const gcc_parent_names_4[] = { 
	"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[] = {

	{ P_BI_TCXO, 0 },

	{ P_GPLL0_OUT_MAIN, 1 },