hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/rtc/rtc-sun6i.c
....@@ -128,7 +128,6 @@
128128 unsigned int fixed_prescaler : 16;
129129 unsigned int has_prescaler : 1;
130130 unsigned int has_out_clk : 1;
131
- unsigned int export_iosc : 1;
132131 unsigned int has_losc_en : 1;
133132 unsigned int has_auto_swt : 1;
134133 };
....@@ -260,10 +259,8 @@
260259 /* Yes, I know, this is ugly. */
261260 sun6i_rtc = rtc;
262261
263
- /* Only read IOSC name from device tree if it is exported */
264
- if (rtc->data->export_iosc)
265
- of_property_read_string_index(node, "clock-output-names", 2,
266
- &iosc_name);
262
+ of_property_read_string_index(node, "clock-output-names", 2,
263
+ &iosc_name);
267264
268265 rtc->int_osc = clk_hw_register_fixed_rate_with_accuracy(NULL,
269266 iosc_name,
....@@ -304,13 +301,10 @@
304301 goto err_register;
305302 }
306303
307
- clk_data->num = 2;
304
+ clk_data->num = 3;
308305 clk_data->hws[0] = &rtc->hw;
309306 clk_data->hws[1] = __clk_get_hw(rtc->ext_losc);
310
- if (rtc->data->export_iosc) {
311
- clk_data->hws[2] = rtc->int_osc;
312
- clk_data->num = 3;
313
- }
307
+ clk_data->hws[2] = rtc->int_osc;
314308 of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
315309 return;
316310
....@@ -350,7 +344,6 @@
350344 .fixed_prescaler = 32,
351345 .has_prescaler = 1,
352346 .has_out_clk = 1,
353
- .export_iosc = 1,
354347 };
355348
356349 static void __init sun8i_h3_rtc_clk_init(struct device_node *node)
....@@ -368,7 +361,6 @@
368361 .fixed_prescaler = 32,
369362 .has_prescaler = 1,
370363 .has_out_clk = 1,
371
- .export_iosc = 1,
372364 .has_losc_en = 1,
373365 .has_auto_swt = 1,
374366 };