.. | .. |
---|
128 | 128 | unsigned int fixed_prescaler : 16; |
---|
129 | 129 | unsigned int has_prescaler : 1; |
---|
130 | 130 | unsigned int has_out_clk : 1; |
---|
131 | | - unsigned int export_iosc : 1; |
---|
132 | 131 | unsigned int has_losc_en : 1; |
---|
133 | 132 | unsigned int has_auto_swt : 1; |
---|
134 | 133 | }; |
---|
.. | .. |
---|
260 | 259 | /* Yes, I know, this is ugly. */ |
---|
261 | 260 | sun6i_rtc = rtc; |
---|
262 | 261 | |
---|
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); |
---|
267 | 264 | |
---|
268 | 265 | rtc->int_osc = clk_hw_register_fixed_rate_with_accuracy(NULL, |
---|
269 | 266 | iosc_name, |
---|
.. | .. |
---|
304 | 301 | goto err_register; |
---|
305 | 302 | } |
---|
306 | 303 | |
---|
307 | | - clk_data->num = 2; |
---|
| 304 | + clk_data->num = 3; |
---|
308 | 305 | clk_data->hws[0] = &rtc->hw; |
---|
309 | 306 | 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; |
---|
314 | 308 | of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); |
---|
315 | 309 | return; |
---|
316 | 310 | |
---|
.. | .. |
---|
350 | 344 | .fixed_prescaler = 32, |
---|
351 | 345 | .has_prescaler = 1, |
---|
352 | 346 | .has_out_clk = 1, |
---|
353 | | - .export_iosc = 1, |
---|
354 | 347 | }; |
---|
355 | 348 | |
---|
356 | 349 | static void __init sun8i_h3_rtc_clk_init(struct device_node *node) |
---|
.. | .. |
---|
368 | 361 | .fixed_prescaler = 32, |
---|
369 | 362 | .has_prescaler = 1, |
---|
370 | 363 | .has_out_clk = 1, |
---|
371 | | - .export_iosc = 1, |
---|
372 | 364 | .has_losc_en = 1, |
---|
373 | 365 | .has_auto_swt = 1, |
---|
374 | 366 | }; |
---|