summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidycchen <davidycchen@google.com>2021-07-22 10:48:02 +0800
committerDavid Chen <davidycchen@google.com>2021-08-04 02:18:11 +0000
commit5510c15a236af3d800f9074a4b10ec0cd8df938c (patch)
treeed9374d2ad7bd72a757c81382b0bbb9258f35e57
parentdaada678946892fdc46f6efa03e06714510e78d7 (diff)
downloadfts_touch-5510c15a236af3d800f9074a4b10ec0cd8df938c.tar.gz
touch: fst2: change driver name
Change the driver name to make ftm5 and fst2 module different. Remove SPI_CLOCK_FREQ because SPI speed is set in device tree. bug: 193085179 Signed-off-by: davidycchen <davidycchen@google.com> Change-Id: I79f07ac8170caf032c5cc3b897641490bb4ad529
-rw-r--r--fst2/fts.c3
-rw-r--r--fst2/fts.h2
-rw-r--r--fst2/fts_lib/fts_io.h2
3 files changed, 2 insertions, 5 deletions
diff --git a/fst2/fts.c b/fst2/fts.c
index 45a2b78..7b318c7 100644
--- a/fst2/fts.c
+++ b/fst2/fts.c
@@ -1033,7 +1033,6 @@ static int fts_probe(struct spi_device *client)
#ifndef SPI4_WIRE
client->mode |= SPI_3WIRE;
#endif
- client->max_speed_hz = SPI_CLOCK_FREQ;
client->bits_per_word = 8;
if (spi_setup(client) < 0) {
log_info(1, "%s: Unsupported SPI functionality\n", __func__);
@@ -1244,7 +1243,7 @@ static int fts_remove(struct spi_device *client)
static struct of_device_id fts_of_match_table[] = {
{
- .compatible = "st,fts",
+ .compatible = "st,fst2",
},
{},
};
diff --git a/fst2/fts.h b/fst2/fts.h
index 266a1cb..129d5a7 100644
--- a/fst2/fts.h
+++ b/fst2/fts.h
@@ -22,7 +22,7 @@
#include <linux/device.h>
#include "fts_lib/fts_io.h"
-#define FTS_TS_DRV_NAME "fts"
+#define FTS_TS_DRV_NAME "fst2"
#define FTS_TS_DRV_VERSION "6.0.3"
#define FTS_TS_DRV_VER 0x06000003
diff --git a/fst2/fts_lib/fts_io.h b/fst2/fts_lib/fts_io.h
index 3173dc0..9b29e3e 100644
--- a/fst2/fts_lib/fts_io.h
+++ b/fst2/fts_lib/fts_io.h
@@ -27,8 +27,6 @@
#else
#define SPI4_WIRE /* /< comment if the master is SPI3 wires
* (MOSI and MISO share same line) */
-#define SPI_CLOCK_FREQ 7000000 /* /< clock frequency in Hz of
- * the SPI bus */
#define SPI_DELAY_CS 10 /* /< time in usec to wait
* before rising the CS */
#define DUMMY_BYTE 1 /* /< first byte read is Dummy byte */