Commit b3454ce0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Pull clk fixes from Stephen Boyd:
 "Three clk driver fixes to close out the release

   - Fix a divider calculation breaking boot on Broadcom bcm2835

   - Fix HDMI output on Tanix TX6 mini board by reverting a patch

   - Fix clk_set_rate_range() calls on at91 by considering the range
     while calculating the divisor"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: at91: generated: consider range when calculating best rate
  Revert "clk: sunxi-ng: sun6i-rtc: Add support for H6"
  clk: bcm2835: fix bcm2835_clock_choose_div
parents 93413c84 d0031e6f

drivers/clk/at91/clk-generated.c

+4 −0
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ static void clk_generated_best_diff(struct clk_rate_request *req, 
		tmp_rate = parent_rate;

	else

		tmp_rate = parent_rate / div;



	if (tmp_rate < req->min_rate || tmp_rate > req->max_rate)

		return;



	tmp_diff = abs(req->rate - tmp_rate);



	if (*best_diff < 0 || *best_diff >= tmp_diff) {

drivers/clk/bcm/clk-bcm2835.c

+1 −0
Original line number Diff line number Diff line
@@ -941,6 +941,7 @@ static u32 bcm2835_clock_choose_div(struct clk_hw *hw, 
	u64 temp = (u64)parent_rate << CM_DIV_FRAC_BITS;

	u32 div, mindiv, maxdiv;



	do_div(temp, rate);

	div = temp;

	div &= ~unused_frac_mask;

drivers/clk/sunxi-ng/ccu-sun6i-rtc.c

+0 −15
Original line number Diff line number Diff line
@@ -298,10 +298,6 @@ static const struct sunxi_ccu_desc sun6i_rtc_ccu_desc = { 
	.hw_clks	= &sun6i_rtc_ccu_hw_clks,

};



static const struct clk_parent_data sun50i_h6_osc32k_fanout_parents[] = {

	{ .hw = &osc32k_clk.common.hw },

};



static const struct clk_parent_data sun50i_h616_osc32k_fanout_parents[] = {

	{ .hw = &osc32k_clk.common.hw },

	{ .fw_name = "pll-32k" },
@@ -314,13 +310,6 @@ static const struct clk_parent_data sun50i_r329_osc32k_fanout_parents[] = { 
	{ .hw = &osc24M_32k_clk.common.hw }

};



static const struct sun6i_rtc_match_data sun50i_h6_rtc_ccu_data = {

	.have_ext_osc32k	= true,

	.have_iosc_calibration	= true,

	.osc32k_fanout_parents	= sun50i_h6_osc32k_fanout_parents,

	.osc32k_fanout_nparents	= ARRAY_SIZE(sun50i_h6_osc32k_fanout_parents),

};



static const struct sun6i_rtc_match_data sun50i_h616_rtc_ccu_data = {

	.have_iosc_calibration	= true,

	.rtc_32k_single_parent	= true,
@@ -335,10 +324,6 @@ static const struct sun6i_rtc_match_data sun50i_r329_rtc_ccu_data = { 
};



static const struct of_device_id sun6i_rtc_ccu_match[] = {

	{

		.compatible	= "allwinner,sun50i-h6-rtc",

		.data		= &sun50i_h6_rtc_ccu_data,

	},

	{

		.compatible	= "allwinner,sun50i-h616-rtc",

		.data		= &sun50i_h616_rtc_ccu_data,

drivers/rtc/rtc-sun6i.c

+17 −0
Original line number Diff line number Diff line
@@ -370,6 +370,23 @@ CLK_OF_DECLARE_DRIVER(sun8i_h3_rtc_clk, "allwinner,sun8i-h3-rtc", 
CLK_OF_DECLARE_DRIVER(sun50i_h5_rtc_clk, "allwinner,sun50i-h5-rtc",

		      sun8i_h3_rtc_clk_init);



static const struct sun6i_rtc_clk_data sun50i_h6_rtc_data = {

	.rc_osc_rate = 16000000,

	.fixed_prescaler = 32,

	.has_prescaler = 1,

	.has_out_clk = 1,

	.export_iosc = 1,

	.has_losc_en = 1,

	.has_auto_swt = 1,

};



static void __init sun50i_h6_rtc_clk_init(struct device_node *node)

{

	sun6i_rtc_clk_init(node, &sun50i_h6_rtc_data);

}

CLK_OF_DECLARE_DRIVER(sun50i_h6_rtc_clk, "allwinner,sun50i-h6-rtc",

		      sun50i_h6_rtc_clk_init);



/*

 * The R40 user manual is self-conflicting on whether the prescaler is

 * fixed or configurable. The clock diagram shows it as fixed, but there