@@ -165,7 +165,7 @@ struct goodix_berlin_core {
165
165
struct device * dev ;
166
166
struct regmap * regmap ;
167
167
struct regulator * avdd ;
168
- struct regulator * iovdd ;
168
+ struct regulator * vddio ;
169
169
struct gpio_desc * reset_gpio ;
170
170
struct touchscreen_properties props ;
171
171
struct goodix_berlin_fw_version fw_version ;
@@ -248,19 +248,19 @@ static int goodix_berlin_power_on(struct goodix_berlin_core *cd)
248
248
{
249
249
int error ;
250
250
251
- error = regulator_enable (cd -> iovdd );
251
+ error = regulator_enable (cd -> vddio );
252
252
if (error ) {
253
- dev_err (cd -> dev , "Failed to enable iovdd : %d\n" , error );
253
+ dev_err (cd -> dev , "Failed to enable vddio : %d\n" , error );
254
254
return error ;
255
255
}
256
256
257
- /* Vendor waits 3ms for IOVDD to settle */
257
+ /* Vendor waits 3ms for VDDIO to settle */
258
258
usleep_range (3000 , 3100 );
259
259
260
260
error = regulator_enable (cd -> avdd );
261
261
if (error ) {
262
262
dev_err (cd -> dev , "Failed to enable avdd: %d\n" , error );
263
- goto err_iovdd_disable ;
263
+ goto err_vddio_disable ;
264
264
}
265
265
266
266
/* Vendor waits 15ms for AVDD to settle */
@@ -283,16 +283,16 @@ static int goodix_berlin_power_on(struct goodix_berlin_core *cd)
283
283
err_dev_reset :
284
284
gpiod_set_value_cansleep (cd -> reset_gpio , 1 );
285
285
regulator_disable (cd -> avdd );
286
- err_iovdd_disable :
287
- regulator_disable (cd -> iovdd );
286
+ err_vddio_disable :
287
+ regulator_disable (cd -> vddio );
288
288
return error ;
289
289
}
290
290
291
291
static void goodix_berlin_power_off (struct goodix_berlin_core * cd )
292
292
{
293
293
gpiod_set_value_cansleep (cd -> reset_gpio , 1 );
294
294
regulator_disable (cd -> avdd );
295
- regulator_disable (cd -> iovdd );
295
+ regulator_disable (cd -> vddio );
296
296
}
297
297
298
298
static int goodix_berlin_read_version (struct goodix_berlin_core * cd )
@@ -744,10 +744,10 @@ int goodix_berlin_probe(struct device *dev, int irq, const struct input_id *id,
744
744
return dev_err_probe (dev , PTR_ERR (cd -> avdd ),
745
745
"Failed to request avdd regulator\n" );
746
746
747
- cd -> iovdd = devm_regulator_get (dev , "iovdd " );
748
- if (IS_ERR (cd -> iovdd ))
749
- return dev_err_probe (dev , PTR_ERR (cd -> iovdd ),
750
- "Failed to request iovdd regulator\n" );
747
+ cd -> vddio = devm_regulator_get (dev , "vddio " );
748
+ if (IS_ERR (cd -> vddio ))
749
+ return dev_err_probe (dev , PTR_ERR (cd -> vddio ),
750
+ "Failed to request vddio regulator\n" );
751
751
752
752
error = goodix_berlin_power_on (cd );
753
753
if (error ) {
0 commit comments