Commit 336a968b authored by Angus Ainslie's avatar Angus Ainslie

Merge branch 'goodix' into 'imx8-4.18-wip'

Use mainline goodix driver

Closes #23

See merge request !12
parents 8e3eea02 7be4bc70
Pipeline #3912 passed with stage
in 31 minutes and 21 seconds
......@@ -955,14 +955,16 @@
};
goodix_ts@5d {
compatible = "goodix,gt5688", "goodix,gt1x";
compatible = "goodix,gt5688";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_goodix_ts>;
reg = <0x5d>;
interrupt-parent = <&gpio3>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
goodix,rst-gpio = <&gpio1 5 GPIO_ACTIVE_LOW>;
goodix,irq-gpio = <&gpio3 0 GPIO_ACTIVE_LOW>;
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
reset-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
irq-gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>;
touchscreen-size-x = <720>;
touchscreen-size-y = <1440>;
};
sgtl5000: sgtl5000@a {
......
......@@ -258,7 +258,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
CONFIG_TOUCHSCREEN_ATMEL_MXT_T37=y
CONFIG_TOUCHSCREEN_GOODIX=m
CONFIG_TOUCHSCREEN_GT1X=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_PWM_VIBRA=m
......
......@@ -1274,16 +1274,4 @@ config TOUCHSCREEN_ROHM_BU21023
To compile this driver as a module, choose M here: the
module will be called bu21023_ts.
config TOUCHSCREEN_GT1X
tristate "GT1X touchscreen"
depends on I2C
help
Say Y here if you have a GT1X based touchscreen
controller.
If unsure, say N.
To compile this driver as a module, choose M here: the
module will be called gt1x.
endif
......@@ -107,4 +107,3 @@ obj-$(CONFIG_TOUCHSCREEN_ZET6223) += zet6223.o
obj-$(CONFIG_TOUCHSCREEN_ZFORCE) += zforce_ts.o
obj-$(CONFIG_TOUCHSCREEN_COLIBRI_VF50) += colibri-vf50-ts.o
obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023) += rohm_bu21023.o
obj-$(CONFIG_TOUCHSCREEN_GT1X) += gt1x/
......@@ -942,6 +942,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,gt5688" },
{ .compatible = "goodix,gt911" },
{ .compatible = "goodix,gt9110" },
{ .compatible = "goodix,gt912" },
......
#
# Makefile for the GT1X touchscreen driver.
#
obj-y += gt1x.o gt1x_generic.o gt1x_update.o gt1x_tools.o gt1x_extents.o
This diff is collapsed.
/* drivers/input/touchscreen/gt1x.h
*
* 2010 - 2013 Goodix Technology.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be a reference
* to you, when you are integrating the GOODiX's CTP IC into your system,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* Version: 1.4
* Release Date: 2015/07/10
*/
#ifndef _GOODIX_GT1X_H_
#define _GOODIX_GT1X_H_
#include "gt1x_generic.h"
#include <linux/gpio.h>
#ifdef GTP_CONFIG_OF
#include <linux/of_gpio.h>
#include <linux/regulator/consumer.h>
#endif
#ifdef CONFIG_FB
#include <linux/notifier.h>
#include <linux/fb.h>
#endif
#ifdef CONFIG_HAS_EARLYSUSPEND
#include <linux/earlysuspend.h>
#endif
#define IIC_MAX_TRANSFER_SIZE 250
/* Customize your I/O ports & I/O operations */
#ifdef GTP_CONFIG_OF
extern int gt1x_rst_gpio;
extern int gt1x_int_gpio;
#define GTP_RST_PORT gt1x_rst_gpio
#define GTP_INT_PORT gt1x_int_gpio
#else
#define GTP_RST_PORT 102 //S5PV210_GPJ3(6)
#define GTP_INT_PORT 52 //S5PV210_GPH1(3)
#endif
#define GTP_INT_IRQ gpio_to_irq(GTP_INT_PORT)
//#define GTP_INT_CFG S3C_GPIO_SFN(0xF)
#define GTP_GPIO_AS_INPUT(pin) do{\
gpio_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_IRQ_TAB {IRQ_TYPE_EDGE_RISING, IRQ_TYPE_EDGE_FALLING, IRQ_TYPE_LEVEL_LOW, IRQ_TYPE_LEVEL_HIGH}
#endif /* _GOODIX_GT1X_H_ */
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment