input: touchscreen: Add goodix GT5553 CTP support
Subsystems (4)
v4 cover input: touchscreen: Add goodix GT5553 CTP support
This patchset support goodix GT5553 CTP.
Changes for v4:
- devm_add_action_or_reset for disabling regulator Changes for v3:
- add cover-letter
- s/ADVV28/AVDD28 on commit head
- fix few typo
Changes for v2:
- Rename vcc-supply with AVDD28-supply
- disable regulator in remove
- fix to setup regulator in probe code
- add chipdata
- drop example node in dt-bindings
Jagan Teki (4):
dt-bindings: input: touchscreen: goodix: Document AVDD28-supply
property
Input: goodix - Add AVDD28-supply regulator support
dt-bindings: input: touchscreen: goodix: Add GT5663 compatible
Input: goodix - Add GT5663 CTP support
.../bindings/input/touchscreen/goodix.txt | 2 + drivers/input/touchscreen/goodix.c | 46 +++++++++++++++++-- 2 files changed, 43 insertions(+), 5 deletions(-)
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH v4 1/4 dt-bindings: input: touchscreen: goodix: Document AVDD28-supply property
Most of the Goodix CTP controllers are supply with AVDD28 pin. which need to supply for controllers like GT5663 on some boards to trigger the power.
So, document the supply property so-that the require boards that used on GT5663 can enable it via device tree.
--- Documentation/devicetree/bindings/input/touchscreen/goodix.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/input/touchscreen/goodix.txt +1 -0
@@ -23,6 +23,7 @@ Optional properties: - touchscreen-inverted-y : Y axis is inverted (boolean) - touchscreen-swapped-x-y : X and Y axis are swapped (boolean) (swapping is done after inverting the axis) + - AVDD28-supply : Analog power supply regulator on AVDD28 pin Example:
Signature · 1 line
2.18.0.321.gffc6fa0e3
PATCH v4 2/4 Input: goodix - Add AVDD28-supply regulator support
In reply to Jagan TekiGoodix CTP controllers have AVDD28 pin connected to voltage regulator which may not be turned on by default, like for GT5663.
Add support for such ctp used boards by adding voltage regulator handling code to goodix ctp driver.
--- drivers/input/touchscreen/goodix.c | 44 ++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 5 deletions(-)
drivers/input/touchscreen/goodix.c +39 -5
@@ -27,6 +27,7 @@#include <linux/delay.h> #include <linux/irq.h> #include <linux/interrupt.h> +#include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/acpi.h> #include <linux/of.h>
@@ -47,6 +48,7 @@ struct goodix_ts_data {struct touchscreen_properties prop;unsigned int max_touch_num;unsigned int int_trigger_type; +struct regulator *avdd28;struct gpio_desc *gpiod_int;struct gpio_desc *gpiod_rst;u16 id;
@@ -761,6 +763,13 @@ static void goodix_config_cb(const struct firmware *cfg, void *ctx)complete_all (&ts->firmware_loading_complete); } +static void goodix_disable_regulator (void *arg) +{ +struct goodix_ts_data *ts = arg; + +regulator_disable (ts->avdd28); +} +static int goodix_ts_probe (struct i2c_client *client,const struct i2c_device_id *id) {
@@ -786,25 +795,46 @@ static int goodix_ts_probe(struct i2c_client *client,if (error)return error; + ts->avdd28 =devm_regulator_get (&client->dev,"AVDD28" ); +if (IS_ERR (ts->avdd28)) { + error =PTR_ERR (ts->avdd28); +if (error != -EPROBE_DEFER ) +dev_err (&client->dev, +"Failed to get AVDD28 regulator: %d\n" , error); +return error; + } + +/* power the controller */ + error =regulator_enable (ts->avdd28); +if (error) { +dev_err (&client->dev,"Controller fail to enable AVDD28\n" ); +return error; + } + + error =devm_add_action_or_reset (&client->dev, + goodix_disable_regulator, ts); +if (error) +return error; +if (ts->gpiod_int && ts->gpiod_rst) {/* reset the controller */ error =goodix_reset (ts);if (error) {dev_err (&client->dev,"Controller reset failed.\n" ); -return error; + goto error; } } error =goodix_i2c_test (client);if (error) {dev_err (&client->dev,"I2C communication failure: %d\n" , error); -return error; + goto error; } error =goodix_read_version (ts);if (error) {dev_err (&client->dev,"Read version failed.\n" ); -return error; + goto error; } ts->chip =goodix_get_chip_data (ts->id);
@@ -823,17 +853,21 @@ static int goodix_ts_probe(struct i2c_client *client,dev_err (&client->dev,"Failed to invoke firmware loader: %d\n" , error); -return error; + goto error; }return 0 ; }else { error =goodix_configure_dev (ts);if (error) -return error; + goto error; }return 0 ; + +error: +regulator_disable (ts->avdd28); +return error; }static int goodix_ts_remove (struct i2c_client *client)
Signature · 1 line
2.18.0.321.gffc6fa0e3
Dmitry Torokhov
maintainerRe: [PATCH v4 2/4] Input: goodix - Add AVDD28-supply regulator support
Hi Jagan,
Quoted 67 lines · Jagan Teki
Goodix CTP controllers have AVDD28 pin connected to voltage regulator which may not be turned on by default, like for GT5663.
Add support for such ctp used boards by adding voltage regulator handling code to goodix ctp driver.
Signed-off-by Jagan Teki <[email protected]>--- drivers/input/touchscreen/goodix.c | 44 ++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 5 deletions(-)drivers/input/touchscreen/goodix.c +27
-0@@ -27,6 +27,7 @@#include <linux/delay.h> #include <linux/irq.h> #include <linux/interrupt.h> +#include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/acpi.h> #include <linux/of.h> @@ -47,6 +48,7 @@ struct goodix_ts_data {struct touchscreen_properties prop;unsigned int max_touch_num;unsigned int int_trigger_type; +struct regulator *avdd28;struct gpio_desc *gpiod_int;struct gpio_desc *gpiod_rst;u16 id;@@ -761,6 +763,13 @@ static void goodix_config_cb(const struct firmware *cfg, void *ctx)complete_all (&ts->firmware_loading_complete); } +static void goodix_disable_regulator (void *arg) +{ +struct goodix_ts_data *ts = arg; + +regulator_disable (ts->avdd28); +} +static int goodix_ts_probe (struct i2c_client *client,const struct i2c_device_id *id) {@@ -786,25 +795,46 @@ static int goodix_ts_probe(struct i2c_client *client,if (error)return error; + ts->avdd28 =devm_regulator_get (&client->dev,"AVDD28" ); +if (IS_ERR (ts->avdd28)) { + error =PTR_ERR (ts->avdd28); +if (error != -EPROBE_DEFER ) +dev_err (&client->dev, +"Failed to get AVDD28 regulator: %d\n" , error); +return error; + } + +/* power the controller */ + error =regulator_enable (ts->avdd28); +if (error) { +dev_err (&client->dev,"Controller fail to enable AVDD28\n" ); +return error; + } + + error =devm_add_action_or_reset (&client->dev, + goodix_disable_regulator, ts);
drivers/input/touchscreen/goodix.c static int goodix_ts_probe(struct i2c_client *client, · line 824
Quoted 10 lines
drivers/input/touchscreen/goodix.c +4
-1+if (error) +return error; +if (ts->gpiod_int && ts->gpiod_rst) {/* reset the controller */ error =goodix_reset (ts);if (error) {dev_err (&client->dev,"Controller reset failed.\n" ); -return error; + goto error;
Why are you changing this? You added goodix_disable_regulator() as custom devm action, so it will fire if probe() returns with error.
Thanks.
Signature · 1 line
Dmitry
PATCH v4 3/4 dt-bindings: input: touchscreen: goodix: Add GT5663 compatible
In reply to Jagan TekiGT5663 is capacitive touch controller with customized smart wakeup gestures, it support chipdata which is similar to existing GT1151 and require AVDD28 supply for some boards.
Document the compatible for the same.
--- Documentation/devicetree/bindings/input/touchscreen/goodix.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/input/touchscreen/goodix.txt +1 -0
@@ -3,6 +3,7 @@ Device tree bindings for Goodix GT9xx series touchscreen controller Required properties: - compatible : Should be "goodix,gt1151" + or "goodix,gt5663" or "goodix,gt911" or "goodix,gt9110" or "goodix,gt912"
Signature · 1 line
2.18.0.321.gffc6fa0e3
Re: [PATCH v4 3/4] dt-bindings: input: touchscreen: goodix: Add GT5663 compatible
Quoted 11 lines · Jagan Teki
GT5663 is capacitive touch controller with customized smart wakeup gestures, it support chipdata which is similar to existing GT1151 and require AVDD28 supply for some boards.
Document the compatible for the same.
Signed-off-by Jagan Teki <[email protected]>--- Documentation/devicetree/bindings/input/touchscreen/goodix.txt | 1 + 1 file changed, 1 insertion(+)
PATCH v4 4/4 Input: goodix - Add GT5663 CTP support
In reply to Jagan TekiGT5663 is capacitive touch controller with customized smart wakeup gestures.
Add support for it by adding compatible and supported chip data.
The chip data on GT5663 is similar to GT1151, like
- config data register has 0x8050 address
- config data register max len is 240
- config data checksum has 16-bit
--- drivers/input/touchscreen/goodix.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/input/touchscreen/goodix.c +2 -0
@@ -218,6 +218,7 @@ static const struct goodix_chip_data *goodix_get_chip_data(u16 id) {switch (id) {case 1151 : +case 5663 :return >1x_chip_data;case 911 :
@@ -976,6 +977,7 @@ MODULE_DEVICE_TABLE(acpi, goodix_acpi_match);#ifdef CONFIG_OF static const struct of_device_id goodix_of_match[] = { { .compatible ="goodix,gt1151" }, + { .compatible ="goodix,gt5663" }, { .compatible ="goodix,gt911" }, { .compatible ="goodix,gt9110" }, { .compatible = "goodix,gt912" },
Signature · 1 line
2.18.0.321.gffc6fa0e3