Revert "clk: sunxi-ng: sun6i-rtc: Add support for H6"
Jernej Skrabec
maintainerPATCH 1/1 Revert "clk: sunxi-ng: sun6i-rtc: Add support for H6"
This reverts commit 1738890a3165ccd0da98ebd3e2d5f9b230d5afa8.
Commit 1738890a3165 ("clk: sunxi-ng: sun6i-rtc: Add support for H6") breaks HDMI output on Tanix TX6 mini board. Exact reason isn't known, but because that commit doesn't actually improve anything, let's just revert it.
Signed-off-by Jernej Skrabec <[email protected]>
--- drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 15 --------------- drivers/rtc/rtc-sun6i.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-)
drivers/clk/sunxi-ng/ccu-sun6i-rtc.c +0 -15
@@ -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
@@ -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
Signature · 1 line
2.36.1
Quoting Jernej Skrabec (2022-05-11 13:02:06)
Quoted 10 lines
This reverts commit
1738890a3165ccd0da98ebd3e2d5f9b230d5afa8.Commit
1738890a3165("clk: sunxi-ng: sun6i-rtc: Add support for H6") breaks HDMI output on Tanix TX6 mini board. Exact reason isn't known, but because that commit doesn't actually improve anything, let's just revert it.Signed-off-by Jernej Skrabec <[email protected]>---
Applied to clk-fixes