@@ -201,14 +201,6 @@ static struct mpfs_msspll_hw_clock mpfs_msspll_clks[] = {
201
201
MSSPLL_FBDIV_WIDTH , 0 , REG_MSSPLL_SSCG_2_CR ),
202
202
};
203
203
204
- static int mpfs_clk_register_msspll (struct device * dev , struct mpfs_msspll_hw_clock * msspll_hw ,
205
- void __iomem * base )
206
- {
207
- msspll_hw -> base = base ;
208
-
209
- return devm_clk_hw_register (dev , & msspll_hw -> hw );
210
- }
211
-
212
204
static int mpfs_clk_register_mssplls (struct device * dev , struct mpfs_msspll_hw_clock * msspll_hws ,
213
205
unsigned int num_clks , struct mpfs_clock_data * data )
214
206
{
@@ -218,7 +210,8 @@ static int mpfs_clk_register_mssplls(struct device *dev, struct mpfs_msspll_hw_c
218
210
for (i = 0 ; i < num_clks ; i ++ ) {
219
211
struct mpfs_msspll_hw_clock * msspll_hw = & msspll_hws [i ];
220
212
221
- ret = mpfs_clk_register_msspll (dev , msspll_hw , data -> msspll_base );
213
+ msspll_hw -> base = data -> msspll_base ;
214
+ ret = devm_clk_hw_register (dev , & msspll_hw -> hw );
222
215
if (ret )
223
216
return dev_err_probe (dev , ret , "failed to register msspll id: %d\n" ,
224
217
CLK_MSSPLL );
@@ -317,14 +310,6 @@ static struct mpfs_cfg_hw_clock mpfs_cfg_clks[] = {
317
310
}
318
311
};
319
312
320
- static int mpfs_clk_register_cfg (struct device * dev , struct mpfs_cfg_hw_clock * cfg_hw ,
321
- void __iomem * base )
322
- {
323
- cfg_hw -> cfg .reg = base + cfg_hw -> reg_offset ;
324
-
325
- return devm_clk_hw_register (dev , & cfg_hw -> hw );
326
- }
327
-
328
313
static int mpfs_clk_register_cfgs (struct device * dev , struct mpfs_cfg_hw_clock * cfg_hws ,
329
314
unsigned int num_clks , struct mpfs_clock_data * data )
330
315
{
@@ -334,7 +319,8 @@ static int mpfs_clk_register_cfgs(struct device *dev, struct mpfs_cfg_hw_clock *
334
319
for (i = 0 ; i < num_clks ; i ++ ) {
335
320
struct mpfs_cfg_hw_clock * cfg_hw = & cfg_hws [i ];
336
321
337
- ret = mpfs_clk_register_cfg (dev , cfg_hw , data -> base );
322
+ cfg_hw -> cfg .reg = data -> base + cfg_hw -> reg_offset ;
323
+ ret = devm_clk_hw_register (dev , & cfg_hw -> hw );
338
324
if (ret )
339
325
return dev_err_probe (dev , ret , "failed to register clock id: %d\n" ,
340
326
cfg_hw -> id );
@@ -458,14 +444,6 @@ static struct mpfs_periph_hw_clock mpfs_periph_clks[] = {
458
444
CLK_PERIPH (CLK_CFM , "clk_periph_cfm" , PARENT_CLK (AHB ), 29 , 0 ),
459
445
};
460
446
461
- static int mpfs_clk_register_periph (struct device * dev , struct mpfs_periph_hw_clock * periph_hw ,
462
- void __iomem * base )
463
- {
464
- periph_hw -> periph .reg = base + REG_SUBBLK_CLOCK_CR ;
465
-
466
- return devm_clk_hw_register (dev , & periph_hw -> hw );
467
- }
468
-
469
447
static int mpfs_clk_register_periphs (struct device * dev , struct mpfs_periph_hw_clock * periph_hws ,
470
448
int num_clks , struct mpfs_clock_data * data )
471
449
{
@@ -475,7 +453,8 @@ static int mpfs_clk_register_periphs(struct device *dev, struct mpfs_periph_hw_c
475
453
for (i = 0 ; i < num_clks ; i ++ ) {
476
454
struct mpfs_periph_hw_clock * periph_hw = & periph_hws [i ];
477
455
478
- ret = mpfs_clk_register_periph (dev , periph_hw , data -> base );
456
+ periph_hw -> periph .reg = data -> base + REG_SUBBLK_CLOCK_CR ;
457
+ ret = devm_clk_hw_register (dev , & periph_hw -> hw );
479
458
if (ret )
480
459
return dev_err_probe (dev , ret , "failed to register clock id: %d\n" ,
481
460
periph_hw -> id );
0 commit comments