Merge branches 'clk-fixed-rate-remove' and 'clk-qcom-cleanup' into clk-next (9a1d6b23) · Commits · 戴 / test

drivers/clk/clk-fixed-rate.c

+1 −0

Original line number	Original line	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);		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;

+0 −16

Original line number	Original line	Diff line number	Diff line
	@@ -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 },