Merge tag 'for-linus-6.4-1' of https://github.com/cminyard/linux-ipmi

[tomoyo/tomoyo-test1.git] / drivers / rtc / rtc-sun6i.c

diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
index ed55160..7038f47 100644 (file)
--- a/drivers/rtc/rtc-sun6i.c
+++ b/drivers/rtc/rtc-sun6i.c
@@ -136,7 +136,6 @@ struct sun6i_rtc_clk_data {
        unsigned int fixed_prescaler : 16;
        unsigned int has_prescaler : 1;
        unsigned int has_out_clk : 1;
-       unsigned int export_iosc : 1;
        unsigned int has_losc_en : 1;
        unsigned int has_auto_swt : 1;
 };
@@ -271,10 +270,8 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
        /* Yes, I know, this is ugly. */
        sun6i_rtc = rtc;
 
-       /* Only read IOSC name from device tree if it is exported */
-       if (rtc->data->export_iosc)
-               of_property_read_string_index(node, "clock-output-names", 2,
-                                             &iosc_name);
+       of_property_read_string_index(node, "clock-output-names", 2,
+                                     &iosc_name);
 
        rtc->int_osc = clk_hw_register_fixed_rate_with_accuracy(NULL,
                                                                iosc_name,
@@ -315,13 +312,10 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
                goto err_register;
        }
 
-       clk_data->num = 2;
+       clk_data->num = 3;
        clk_data->hws[0] = &rtc->hw;
        clk_data->hws[1] = __clk_get_hw(rtc->ext_losc);
-       if (rtc->data->export_iosc) {
-               clk_data->hws[2] = rtc->int_osc;
-               clk_data->num = 3;
-       }
+       clk_data->hws[2] = rtc->int_osc;
        of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
        return;
 
@@ -361,7 +355,6 @@ static const struct sun6i_rtc_clk_data sun8i_h3_rtc_data = {
        .fixed_prescaler = 32,
        .has_prescaler = 1,
        .has_out_clk = 1,
-       .export_iosc = 1,
 };
 
 static void __init sun8i_h3_rtc_clk_init(struct device_node *node)
@@ -379,7 +372,6 @@ static const struct sun6i_rtc_clk_data sun50i_h6_rtc_data = {
        .fixed_prescaler = 32,
        .has_prescaler = 1,
        .has_out_clk = 1,
-       .export_iosc = 1,
        .has_losc_en = 1,
        .has_auto_swt = 1,
 };