@@ -125,27 +125,6 @@ static int bd71837_get_buck34_enable_hwctrl(struct regulator_dev *rdev)
125
125
126
126
return !!(BD718XX_BUCK_RUN_ON & val );
127
127
}
128
- /*
129
- * On BD71837 (not on BD71847, BD71850, ...)
130
- * Bucks 1 to 4 support DVS. PWM mode is used when voltage is changed.
131
- * Bucks 5 to 8 and LDOs can use PFM and must be disabled when voltage
132
- * is changed. Hence we return -EBUSY for these if voltage is changed
133
- * when BUCK/LDO is enabled.
134
- *
135
- * On BD71847, BD71850, ... The LDO voltage can be changed when LDO is
136
- * enabled. But if voltage is increased the LDO power-good monitoring
137
- * must be disabled for the duration of changing + 1mS to ensure voltage
138
- * has reached the higher level before HW does next under voltage detection
139
- * cycle.
140
- */
141
- static int bd71837_set_voltage_sel_restricted (struct regulator_dev * rdev ,
142
- unsigned int sel )
143
- {
144
- if (rdev -> desc -> ops -> is_enabled (rdev ))
145
- return - EBUSY ;
146
-
147
- return regulator_set_voltage_sel_regmap (rdev , sel );
148
- }
149
128
150
129
static void voltage_change_done (struct regulator_dev * rdev , unsigned int sel ,
151
130
unsigned int * mask )
@@ -642,22 +621,22 @@ BD718XX_OPS(bd71837_pickable_range_buck_ops,
642
621
bd718x7_set_buck_ovp );
643
622
644
623
BD718XX_OPS (bd71837_ldo_regulator_ops , regulator_list_voltage_linear_range ,
645
- NULL , bd71837_set_voltage_sel_restricted ,
624
+ NULL , rohm_regulator_set_voltage_sel_restricted ,
646
625
regulator_get_voltage_sel_regmap , NULL , NULL , bd718x7_set_ldo_uvp ,
647
626
NULL );
648
627
649
628
BD718XX_OPS (bd71837_ldo_regulator_nolinear_ops , regulator_list_voltage_table ,
650
- NULL , bd71837_set_voltage_sel_restricted ,
629
+ NULL , rohm_regulator_set_voltage_sel_restricted ,
651
630
regulator_get_voltage_sel_regmap , NULL , NULL , bd718x7_set_ldo_uvp ,
652
631
NULL );
653
632
654
633
BD718XX_OPS (bd71837_buck_regulator_ops , regulator_list_voltage_linear_range ,
655
- NULL , bd71837_set_voltage_sel_restricted ,
634
+ NULL , rohm_regulator_set_voltage_sel_restricted ,
656
635
regulator_get_voltage_sel_regmap , regulator_set_voltage_time_sel ,
657
636
NULL , bd718x7_set_buck_uvp , bd718x7_set_buck_ovp );
658
637
659
638
BD718XX_OPS (bd71837_buck_regulator_nolinear_ops , regulator_list_voltage_table ,
660
- regulator_map_voltage_ascend , bd71837_set_voltage_sel_restricted ,
639
+ regulator_map_voltage_ascend , rohm_regulator_set_voltage_sel_restricted ,
661
640
regulator_get_voltage_sel_regmap , regulator_set_voltage_time_sel ,
662
641
NULL , bd718x7_set_buck_uvp , bd718x7_set_buck_ovp );
663
642
/*
0 commit comments