@@ -487,16 +487,17 @@ static int ab8500_charger_get_ac_voltage(struct ab8500_charger *di)
487
487
488
488
/* Only measure voltage if the charger is connected */
489
489
if (di -> ac .charger_connected ) {
490
- ret = iio_read_channel_processed (di -> adc_main_charger_v , & vch );
490
+ /* Convert to microvolt, IIO returns millivolt */
491
+ ret = iio_read_channel_processed_scale (di -> adc_main_charger_v ,
492
+ & vch , 1000 );
491
493
if (ret < 0 ) {
492
494
dev_err (di -> dev , "%s ADC conv failed,\n" , __func__ );
493
495
return ret ;
494
496
}
495
497
} else {
496
498
vch = 0 ;
497
499
}
498
- /* Convert to microvolt, IIO returns millivolt */
499
- return vch * 1000 ;
500
+ return vch ;
500
501
}
501
502
502
503
/**
@@ -541,16 +542,17 @@ static int ab8500_charger_get_vbus_voltage(struct ab8500_charger *di)
541
542
542
543
/* Only measure voltage if the charger is connected */
543
544
if (di -> usb .charger_connected ) {
544
- ret = iio_read_channel_processed (di -> adc_vbus_v , & vch );
545
+ /* Convert to microvolt, IIO returns millivolt */
546
+ ret = iio_read_channel_processed_scale (di -> adc_vbus_v ,
547
+ & vch , 1000 );
545
548
if (ret < 0 ) {
546
549
dev_err (di -> dev , "%s ADC conv failed,\n" , __func__ );
547
550
return ret ;
548
551
}
549
552
} else {
550
553
vch = 0 ;
551
554
}
552
- /* Convert to microvolt, IIO returns millivolt */
553
- return vch * 1000 ;
555
+ return vch ;
554
556
}
555
557
556
558
/**
@@ -566,16 +568,17 @@ static int ab8500_charger_get_usb_current(struct ab8500_charger *di)
566
568
567
569
/* Only measure current if the charger is online */
568
570
if (di -> usb .charger_online ) {
569
- ret = iio_read_channel_processed (di -> adc_usb_charger_c , & ich );
571
+ /* Return microamperes */
572
+ ret = iio_read_channel_processed_scale (di -> adc_usb_charger_c ,
573
+ & ich , 1000 );
570
574
if (ret < 0 ) {
571
575
dev_err (di -> dev , "%s ADC conv failed,\n" , __func__ );
572
576
return ret ;
573
577
}
574
578
} else {
575
579
ich = 0 ;
576
580
}
577
- /* Return microamperes */
578
- return ich * 1000 ;
581
+ return ich ;
579
582
}
580
583
581
584
/**
@@ -591,16 +594,17 @@ static int ab8500_charger_get_ac_current(struct ab8500_charger *di)
591
594
592
595
/* Only measure current if the charger is online */
593
596
if (di -> ac .charger_online ) {
594
- ret = iio_read_channel_processed (di -> adc_main_charger_c , & ich );
597
+ /* Return microamperes */
598
+ ret = iio_read_channel_processed_scale (di -> adc_main_charger_c ,
599
+ & ich , 1000 );
595
600
if (ret < 0 ) {
596
601
dev_err (di -> dev , "%s ADC conv failed,\n" , __func__ );
597
602
return ret ;
598
603
}
599
604
} else {
600
605
ich = 0 ;
601
606
}
602
- /* Return microamperes */
603
- return ich * 1000 ;
607
+ return ich ;
604
608
}
605
609
606
610
/**
0 commit comments