Commit 111bf02b authored Dec 05, 2019 by Chen-Yu Tsai Committed by Alexandre Belloni Dec 10, 2019

rtc: sun6i: Add support for RTC clocks on R40



When support for the R40 in the rtc-sun6i driver was split out for a
separate compatible string, only the RTC half was covered, and not the
clock half. Unfortunately this results in the whole driver not working,
as the RTC half expects the clock half to have been initialized.

Add support for the clock part as well. The clock part is like the H3,
but does not need to export the internal oscillator, nor does it have
a gateable LOSC external output.

This fixes issues with WiFi and Bluetooth not working on the BPI M2U.

Fixes: d6624cc7 ("rtc: sun6i: Add R40 compatible")
Cc: <stable@vger.kernel.org> # 5.3.x
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <mripard@kernel.org>
Link: https://lore.kernel.org/r/20191205085054.6049-1-wens@kernel.org


Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

parent e42617b8

drivers/rtc/rtc-sun6i.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -379,6 +379,22 @@ static void __init sun50i_h6_rtc_clk_init(struct device_node *node)
		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
		* is also a configurable divider in the RTC block.
		*/
		static const struct sun6i_rtc_clk_data sun8i_r40_rtc_data = {
		.rc_osc_rate = 16000000,
		.fixed_prescaler = 512,
		};
		static void __init sun8i_r40_rtc_clk_init(struct device_node *node)
		{
		sun6i_rtc_clk_init(node, &sun8i_r40_rtc_data);
		}
		CLK_OF_DECLARE_DRIVER(sun8i_r40_rtc_clk, "allwinner,sun8i-r40-rtc",
		sun8i_r40_rtc_clk_init);

		static const struct sun6i_rtc_clk_data sun8i_v3_rtc_data = {
		.rc_osc_rate = 32000,
		.has_out_clk = 1,

Admin message