Commit 3b001105 authored by Luca Weiss's avatar Luca Weiss Committed by Dmitry Torokhov
Browse files

Input: goodix-berlin - fix vddio regulator references 



As per dt-bindings the property is called vddio-supply, so use the
correct name in the driver instead of iovdd. The datasheet also calls
the supply 'VDDIO'.

Fixes: 44362279 ("Input: add core support for Goodix Berlin Touchscreen IC")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarLuca Weiss <luca.weiss@fairphone.com>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20250103-goodix-berlin-fixes-v1-2-b014737b08b2@fairphone.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 5bab1ae5

drivers/input/touchscreen/goodix_berlin_core.c

+12 −12
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ struct goodix_berlin_core { 
	struct device *dev;

	struct regmap *regmap;

	struct regulator *avdd;

	struct regulator *iovdd;

	struct regulator *vddio;

	struct gpio_desc *reset_gpio;

	struct touchscreen_properties props;

	struct goodix_berlin_fw_version fw_version;
@@ -248,19 +248,19 @@ static int goodix_berlin_power_on(struct goodix_berlin_core *cd) 
{

	int error;



	error = regulator_enable(cd->iovdd);

	error = regulator_enable(cd->vddio);

	if (error) {

		dev_err(cd->dev, "Failed to enable iovdd: %d\n", error);

		dev_err(cd->dev, "Failed to enable vddio: %d\n", error);

		return error;

	}



	/* Vendor waits 3ms for IOVDD to settle */

	/* Vendor waits 3ms for VDDIO to settle */

	usleep_range(3000, 3100);



	error = regulator_enable(cd->avdd);

	if (error) {

		dev_err(cd->dev, "Failed to enable avdd: %d\n", error);

		goto err_iovdd_disable;

		goto err_vddio_disable;

	}



	/* Vendor waits 15ms for AVDD to settle */
@@ -283,8 +283,8 @@ static int goodix_berlin_power_on(struct goodix_berlin_core *cd) 
err_dev_reset:

	gpiod_set_value_cansleep(cd->reset_gpio, 1);

	regulator_disable(cd->avdd);

err_iovdd_disable:

	regulator_disable(cd->iovdd);

err_vddio_disable:

	regulator_disable(cd->vddio);

	return error;

}
@@ -292,7 +292,7 @@ static void goodix_berlin_power_off(struct goodix_berlin_core *cd) 
{

	gpiod_set_value_cansleep(cd->reset_gpio, 1);

	regulator_disable(cd->avdd);

	regulator_disable(cd->iovdd);

	regulator_disable(cd->vddio);

}



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, 
		return dev_err_probe(dev, PTR_ERR(cd->avdd),

				     "Failed to request avdd regulator\n");



	cd->iovdd = devm_regulator_get(dev, "iovdd");

	if (IS_ERR(cd->iovdd))

		return dev_err_probe(dev, PTR_ERR(cd->iovdd),

				     "Failed to request iovdd regulator\n");

	cd->vddio = devm_regulator_get(dev, "vddio");

	if (IS_ERR(cd->vddio))

		return dev_err_probe(dev, PTR_ERR(cd->vddio),

				     "Failed to request vddio regulator\n");



	error = goodix_berlin_power_on(cd);

	if (error) {