@@ -327,36 +327,6 @@ struct rk817_charger {
327
327
int plugout_irq ;
328
328
};
329
329
330
- static const struct regmap_range rk817_charge_readonly_reg_ranges [] = {
331
- regmap_reg_range (0xEB , 0xEB ),
332
- };
333
-
334
- static const struct regmap_access_table rk817_charge_writeable_regs = {
335
- .no_ranges = rk817_charge_readonly_reg_ranges ,
336
- .n_no_ranges = ARRAY_SIZE (rk817_charge_readonly_reg_ranges ),
337
- };
338
-
339
- static const struct regmap_range rk817_charge_volatile_reg_ranges [] = {
340
- regmap_reg_range (0xB4 , 0xB4 ),
341
- regmap_reg_range (0xE4 , 0xEA ),
342
- regmap_reg_range (0xEC , 0xEC ),
343
- };
344
-
345
- static const struct regmap_access_table rk817_charge_volatile_regs = {
346
- .yes_ranges = rk817_charge_volatile_reg_ranges ,
347
- .n_yes_ranges = ARRAY_SIZE (rk817_charge_volatile_reg_ranges ),
348
- };
349
-
350
- static const struct regmap_config rk817_charge_regmap_config = {
351
- .reg_bits = 8 ,
352
- .val_bits = 8 ,
353
-
354
- .max_register = 0xFF ,
355
- .cache_type = REGCACHE_RBTREE ,
356
- .wr_table = & rk817_charge_writeable_regs ,
357
- .volatile_table = & rk817_charge_volatile_regs ,
358
- };
359
-
360
330
static enum power_supply_property rk817_ac_props [] = {
361
331
POWER_SUPPLY_PROP_ONLINE ,
362
332
POWER_SUPPLY_PROP_STATUS ,
@@ -1552,8 +1522,7 @@ static int rk817_charge_probe(struct platform_device *pdev)
1552
1522
charge -> client = client ;
1553
1523
platform_set_drvdata (pdev , charge );
1554
1524
1555
- charge -> regmap = devm_regmap_init_i2c (client ,
1556
- & rk817_charge_regmap_config );
1525
+ charge -> regmap = rk817 -> regmap ;
1557
1526
if (IS_ERR (charge -> regmap )) {
1558
1527
dev_err (charge -> dev , "Failed to initialize regmap\n" );
1559
1528
return - EINVAL ;
@@ -1580,6 +1549,12 @@ static int rk817_charge_probe(struct platform_device *pdev)
1580
1549
1581
1550
rk817_charge_pre_init (charge );
1582
1551
1552
+ ret = rk817_charge_init_power_supply (charge );
1553
+ if (ret ) {
1554
+ dev_err (charge -> dev , "init power supply fail!\n" );
1555
+ return ret ;
1556
+ }
1557
+
1583
1558
ret = rk817_charge_init_dc (charge );
1584
1559
if (ret ) {
1585
1560
dev_err (charge -> dev , "init dc failed!\n" );
@@ -1591,11 +1566,6 @@ static int rk817_charge_probe(struct platform_device *pdev)
1591
1566
dev_err (charge -> dev , "init usb failed!\n" );
1592
1567
return ret ;
1593
1568
}
1594
- ret = rk817_charge_init_power_supply (charge );
1595
- if (ret ) {
1596
- dev_err (charge -> dev , "init power supply fail!\n" );
1597
- return ret ;
1598
- }
1599
1569
1600
1570
ret = rk817_charge_init_irqs (charge );
1601
1571
if (ret ) {
0 commit comments