Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux (d4961772) · Commits · EulixOS / Software / Kernel

drivers/clk/clk-fixed-factor.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,14 @@ EXPORT_SYMBOL_GPL(clk_fixed_factor_ops);

		static void devm_clk_hw_register_fixed_factor_release(struct device dev, void res)
		{
		clk_hw_unregister_fixed_factor(&((struct clk_fixed_factor *)res)->hw);
		struct clk_fixed_factor *fix = res;

		/*
		* We can not use clk_hw_unregister_fixed_factor, since it will kfree()
		* the hw, resulting in double free. Just unregister the hw and let
		* devres code kfree() it.
		*/
		clk_hw_unregister(&fix->hw);
		}

		static struct clk_hw *

drivers/clk/clk.c

+21 −26

Original line number	Diff line number	Diff line
		@@ -4357,10 +4357,9 @@ int clk_notifier_register(struct clk clk, struct notifier_block nb)
		/* search the list of notifiers for this clk */
		list_for_each_entry(cn, &clk_notifier_list, node)
		if (cn->clk == clk)
		break;
		goto found;

		/* if clk wasn't in the notifier list, allocate new clk_notifier */
		if (cn->clk != clk) {
		cn = kzalloc(sizeof(*cn), GFP_KERNEL);
		if (!cn)
		goto out;
		@@ -4369,8 +4368,8 @@ int clk_notifier_register(struct clk clk, struct notifier_block nb)
		srcu_init_notifier_head(&cn->notifier_head);

		list_add(&cn->node, &clk_notifier_list);
		}

		found:
		ret = srcu_notifier_chain_register(&cn->notifier_head, nb);

		clk->core->notifier_count++;
		@@ -4395,18 +4394,15 @@ EXPORT_SYMBOL_GPL(clk_notifier_register);
		*/
		int clk_notifier_unregister(struct clk clk, struct notifier_block nb)
		{
		struct clk_notifier *cn = NULL;
		int ret = -EINVAL;
		struct clk_notifier *cn;
		int ret = -ENOENT;

		if (!clk \|\| !nb)
		return -EINVAL;

		clk_prepare_lock();

		list_for_each_entry(cn, &clk_notifier_list, node)
		if (cn->clk == clk)
		break;

		list_for_each_entry(cn, &clk_notifier_list, node) {
		if (cn->clk == clk) {
		ret = srcu_notifier_chain_unregister(&cn->notifier_head, nb);

		@@ -4418,9 +4414,8 @@ int clk_notifier_unregister(struct clk clk, struct notifier_block nb)
		list_del(&cn->node);
		kfree(cn);
		}

		} else {
		ret = -ENOENT;
		break;
		}
		}

		clk_prepare_unlock();

drivers/clk/qcom/camcc-sc7180.c

+25 −25

Original line number	Diff line number	Diff line
		@@ -304,7 +304,7 @@ static struct clk_rcg2 cam_cc_bps_clk_src = {
		.name = "cam_cc_bps_clk_src",
		.parent_data = cam_cc_parent_data_2,
		.num_parents = 5,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -325,7 +325,7 @@ static struct clk_rcg2 cam_cc_cci_0_clk_src = {
		.name = "cam_cc_cci_0_clk_src",
		.parent_data = cam_cc_parent_data_5,
		.num_parents = 3,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -339,7 +339,7 @@ static struct clk_rcg2 cam_cc_cci_1_clk_src = {
		.name = "cam_cc_cci_1_clk_src",
		.parent_data = cam_cc_parent_data_5,
		.num_parents = 3,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -360,7 +360,7 @@ static struct clk_rcg2 cam_cc_cphy_rx_clk_src = {
		.name = "cam_cc_cphy_rx_clk_src",
		.parent_data = cam_cc_parent_data_3,
		.num_parents = 6,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -379,7 +379,7 @@ static struct clk_rcg2 cam_cc_csi0phytimer_clk_src = {
		.name = "cam_cc_csi0phytimer_clk_src",
		.parent_data = cam_cc_parent_data_0,
		.num_parents = 4,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -393,7 +393,7 @@ static struct clk_rcg2 cam_cc_csi1phytimer_clk_src = {
		.name = "cam_cc_csi1phytimer_clk_src",
		.parent_data = cam_cc_parent_data_0,
		.num_parents = 4,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -407,7 +407,7 @@ static struct clk_rcg2 cam_cc_csi2phytimer_clk_src = {
		.name = "cam_cc_csi2phytimer_clk_src",
		.parent_data = cam_cc_parent_data_0,
		.num_parents = 4,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -421,7 +421,7 @@ static struct clk_rcg2 cam_cc_csi3phytimer_clk_src = {
		.name = "cam_cc_csi3phytimer_clk_src",
		.parent_data = cam_cc_parent_data_0,
		.num_parents = 4,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -443,7 +443,7 @@ static struct clk_rcg2 cam_cc_fast_ahb_clk_src = {
		.name = "cam_cc_fast_ahb_clk_src",
		.parent_data = cam_cc_parent_data_0,
		.num_parents = 4,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -466,7 +466,7 @@ static struct clk_rcg2 cam_cc_icp_clk_src = {
		.name = "cam_cc_icp_clk_src",
		.parent_data = cam_cc_parent_data_2,
		.num_parents = 5,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -488,7 +488,7 @@ static struct clk_rcg2 cam_cc_ife_0_clk_src = {
		.name = "cam_cc_ife_0_clk_src",
		.parent_data = cam_cc_parent_data_4,
		.num_parents = 4,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -510,7 +510,7 @@ static struct clk_rcg2 cam_cc_ife_0_csid_clk_src = {
		.name = "cam_cc_ife_0_csid_clk_src",
		.parent_data = cam_cc_parent_data_3,
		.num_parents = 6,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -524,7 +524,7 @@ static struct clk_rcg2 cam_cc_ife_1_clk_src = {
		.name = "cam_cc_ife_1_clk_src",
		.parent_data = cam_cc_parent_data_4,
		.num_parents = 4,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -538,7 +538,7 @@ static struct clk_rcg2 cam_cc_ife_1_csid_clk_src = {
		.name = "cam_cc_ife_1_csid_clk_src",
		.parent_data = cam_cc_parent_data_3,
		.num_parents = 6,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -553,7 +553,7 @@ static struct clk_rcg2 cam_cc_ife_lite_clk_src = {
		.parent_data = cam_cc_parent_data_4,
		.num_parents = 4,
		.flags = CLK_SET_RATE_PARENT,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -567,7 +567,7 @@ static struct clk_rcg2 cam_cc_ife_lite_csid_clk_src = {
		.name = "cam_cc_ife_lite_csid_clk_src",
		.parent_data = cam_cc_parent_data_3,
		.num_parents = 6,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -590,7 +590,7 @@ static struct clk_rcg2 cam_cc_ipe_0_clk_src = {
		.name = "cam_cc_ipe_0_clk_src",
		.parent_data = cam_cc_parent_data_2,
		.num_parents = 5,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -613,7 +613,7 @@ static struct clk_rcg2 cam_cc_jpeg_clk_src = {
		.name = "cam_cc_jpeg_clk_src",
		.parent_data = cam_cc_parent_data_2,
		.num_parents = 5,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -635,7 +635,7 @@ static struct clk_rcg2 cam_cc_lrme_clk_src = {
		.name = "cam_cc_lrme_clk_src",
		.parent_data = cam_cc_parent_data_6,
		.num_parents = 5,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -656,7 +656,7 @@ static struct clk_rcg2 cam_cc_mclk0_clk_src = {
		.name = "cam_cc_mclk0_clk_src",
		.parent_data = cam_cc_parent_data_1,
		.num_parents = 3,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -670,7 +670,7 @@ static struct clk_rcg2 cam_cc_mclk1_clk_src = {
		.name = "cam_cc_mclk1_clk_src",
		.parent_data = cam_cc_parent_data_1,
		.num_parents = 3,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -684,7 +684,7 @@ static struct clk_rcg2 cam_cc_mclk2_clk_src = {
		.name = "cam_cc_mclk2_clk_src",
		.parent_data = cam_cc_parent_data_1,
		.num_parents = 3,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -698,7 +698,7 @@ static struct clk_rcg2 cam_cc_mclk3_clk_src = {
		.name = "cam_cc_mclk3_clk_src",
		.parent_data = cam_cc_parent_data_1,
		.num_parents = 3,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -712,7 +712,7 @@ static struct clk_rcg2 cam_cc_mclk4_clk_src = {
		.name = "cam_cc_mclk4_clk_src",
		.parent_data = cam_cc_parent_data_1,
		.num_parents = 3,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

		@@ -732,7 +732,7 @@ static struct clk_rcg2 cam_cc_slow_ahb_clk_src = {
		.parent_data = cam_cc_parent_data_0,
		.num_parents = 4,
		.flags = CLK_SET_RATE_PARENT \| CLK_OPS_PARENT_ENABLE,
		.ops = &clk_rcg2_ops,
		.ops = &clk_rcg2_shared_ops,
		},
		};

drivers/clk/socfpga/clk-gate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk,
		val = readl(socfpgaclk->div_reg) >> socfpgaclk->shift;
		val &= GENMASK(socfpgaclk->width - 1, 0);
		/* Check for GPIO_DB_CLK by its offset */
		if ((int) socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET)
		if ((uintptr_t) socfpgaclk->div_reg & SOCFPGA_GPIO_DB_CLK_OFFSET)
		div = val + 1;
		else
		div = (1 << val);