shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

input: touchscreen: gt1x: switch to using gpiod API

Browse Source 
Change-Id: I02c2cad17f0b4e7cf3fd59c1bb6736db8c205f19
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Wu Liangqing
2025-02-21 16:42:47 +08:00
committed by Tao Huang
parent b4f16563e3
commit e0bd8b680d
3 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/input/touchscreen/gt1x/gt1x.c
View File

@@ -31,8 +31,8 @@ static const struct dev_pm_ops gt1x_ts_pm_ops;
#endif
#ifdef GTP_CONFIG_OF
bool gt1x_gt5688;
int gt1x_rst_gpio;
int gt1x_int_gpio;
struct gpio_desc *gt1x_rst_gpio;
struct gpio_desc *gt1x_int_gpio;
static bool power_invert;
#endif
@@ -321,19 +321,16 @@ static int gt1x_parse_dt(struct device *dev)
gt1x_gt5688 = true;
}
gt1x_int_gpio = of_get_named_gpio(np, "goodix,irq-gpio", 0);
gt1x_rst_gpio = of_get_named_gpio(np, "goodix,rst-gpio", 0);
if (!gpio_is_valid(gt1x_int_gpio) && !gpio_is_valid(gt1x_rst_gpio)) {
GTP_ERROR("Invalid GPIO, irq-gpio:%d, rst-gpio:%d",
gt1x_int_gpio, gt1x_rst_gpio);
return -EINVAL;
gt1x_int_gpio = devm_gpiod_get(dev, "goodix,irq", GPIOD_IN);
if (IS_ERR(gt1x_int_gpio)) {
GTP_ERROR("Failed to get irq GPIO");
return PTR_ERR(gt1x_int_gpio);
}
if (!gpio_is_valid(gt1x_int_gpio)) {
GTP_ERROR("Invalid GPIO, irq-gpio:%d",
gt1x_int_gpio);
return -EINVAL;
gt1x_rst_gpio = devm_gpiod_get_optional(dev, "goodix,rst", GPIOD_OUT_LOW);
if (IS_ERR(gt1x_rst_gpio)) {
GTP_ERROR("Failed to get reset GPIO");
return PTR_ERR(gt1x_rst_gpio);
}
vdd_ana = devm_regulator_get_optional(dev, "vdd_ana");
@@ -403,12 +400,6 @@ int gt1x_power_switch(int on)
static void gt1x_remove_gpio_and_power(void)
{
if (gpio_is_valid(gt1x_int_gpio))
gpio_free(gt1x_int_gpio);
if (gpio_is_valid(gt1x_rst_gpio))
gpio_free(gt1x_rst_gpio);
if (gt1x_i2c_client && gt1x_i2c_client->irq)
free_irq(gt1x_i2c_client->irq, gt1x_i2c_client);
}
@@ -419,27 +410,15 @@ static void gt1x_remove_gpio_and_power(void)
*/
static s32 gt1x_request_io_port(void)
{
s32 ret = 0;
GTP_DEBUG_FUNC();
ret = gpio_request(GTP_INT_PORT, "GTP_INT_IRQ");
if (ret < 0) {
GTP_ERROR("Failed to request GPIO:%d, ERRNO:%d", (s32) GTP_INT_PORT, ret);
return ret;
}
if (IS_ERR_OR_NULL(gt1x_int_gpio))
return -1;
GTP_GPIO_AS_INT(GTP_INT_PORT);
gt1x_i2c_client->irq = GTP_INT_IRQ;
if (gpio_is_valid(gt1x_rst_gpio)) {
ret = gpio_request(GTP_RST_PORT, "GTP_RST_PORT");
if (ret < 0) {
GTP_ERROR("Failed to request GPIO:%d, ERRNO:%d", (s32) GTP_RST_PORT, ret);
gpio_free(GTP_INT_PORT);
return ret;
}
GTP_GPIO_AS_INPUT(GTP_RST_PORT);
if (gt1x_i2c_client->irq < 0) {
GTP_ERROR("Failed to get IRQ from GPIO");
return gt1x_i2c_client->irq;
}
return 0;
@@ -458,11 +437,12 @@ static s32 gt1x_request_irq(void)
GTP_DEBUG_FUNC();
GTP_DEBUG("INT trigger type:%x", gt1x_int_type);
if (IS_ERR_OR_NULL(gt1x_int_gpio))
return -1;
ret = request_irq(gt1x_i2c_client->irq, gt1x_ts_irq_handler, irq_table[gt1x_int_type], gt1x_i2c_client->name, gt1x_i2c_client);
if (ret) {
GTP_ERROR("Request IRQ failed!ERRNO:%d.", ret);
GTP_GPIO_AS_INPUT(GTP_INT_PORT);
gpio_free(GTP_INT_PORT);
return -1;
} else {

15
drivers/input/touchscreen/gt1x/gt1x.h
View File

@@ -20,9 +20,8 @@
#ifndef _GOODIX_GT1X_H_
#define _GOODIX_GT1X_H_
#include "gt1x_generic.h"
#include <linux/gpio.h>
#include <linux/gpio/consumer.h>
#ifdef GTP_CONFIG_OF
#include <linux/of_gpio.h>
#include <linux/regulator/consumer.h>
#endif
#ifdef CONFIG_FB
@@ -38,8 +37,8 @@
/* Customize your I/O ports & I/O operations */
#ifdef GTP_CONFIG_OF
extern bool gt1x_gt5688;
extern int gt1x_rst_gpio;
extern int gt1x_int_gpio;
extern struct gpio_desc *gt1x_int_gpio;
extern struct gpio_desc *gt1x_rst_gpio;
extern struct regulator *gt1x_supply;
#define GTP_RST_PORT gt1x_rst_gpio
#define GTP_INT_PORT gt1x_int_gpio
@@ -48,17 +47,17 @@ extern struct regulator *gt1x_supply;
#define GTP_INT_PORT 52
#endif
#define GTP_INT_IRQ gpio_to_irq(GTP_INT_PORT)
#define GTP_INT_IRQ gpiod_to_irq(GTP_INT_PORT)
/*#define GTP_INT_CFG S3C_GPIO_SFN(0xF)*/
#define GTP_GPIO_AS_INPUT(pin) do {\
gpio_direction_input(pin);\
gpiod_direction_input(pin);\
} while (0)
#define GTP_GPIO_AS_INT(pin) do {\
GTP_GPIO_AS_INPUT(pin);\
} while (0)
#define GTP_GPIO_GET_VALUE(pin) gpio_get_value(pin)
#define GTP_GPIO_OUTPUT(pin, level) gpio_direction_output(pin, level)
#define GTP_GPIO_GET_VALUE(pin) gpiod_get_raw_value(pin)
#define GTP_GPIO_OUTPUT(pin, level) gpiod_direction_output_raw(pin, level)
#define GTP_IRQ_TAB {IRQ_TYPE_EDGE_RISING, IRQ_TYPE_EDGE_FALLING, IRQ_TYPE_LEVEL_LOW, IRQ_TYPE_LEVEL_HIGH}
#endif /* _GOODIX_GT1X_H_ */

4
drivers/input/touchscreen/gt1x/gt1x_generic.c
View File

@@ -663,11 +663,11 @@ s32 gt1x_init_panel(void)
void gt1x_select_addr(void)
{
if (gpio_is_valid(gt1x_rst_gpio))
if (!IS_ERR_OR_NULL(gt1x_rst_gpio))
GTP_GPIO_OUTPUT(GTP_RST_PORT, 0);
GTP_GPIO_OUTPUT(GTP_INT_PORT, gt1x_i2c_client->addr == 0x14);
usleep_range(2000, 3000);
if (gpio_is_valid(gt1x_rst_gpio))
if (!IS_ERR_OR_NULL(gt1x_rst_gpio))
GTP_GPIO_OUTPUT(GTP_RST_PORT, 1);
usleep_range(2000, 3000);
}