summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-07-05 17:47:17 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-07-05 17:47:17 -0600
commitfafdc7ed6cf36f6bd50b9ad087458fd49e047ec0 (patch)
tree35183a84acef8c154fc4873ba0738854bda248ac
parent5d0822fd17939ee7bbb36e7092caee0325f442fc (diff)
downloadpx4-nuttx-fafdc7ed6cf36f6bd50b9ad087458fd49e047ec0.tar.gz
px4-nuttx-fafdc7ed6cf36f6bd50b9ad087458fd49e047ec0.tar.bz2
px4-nuttx-fafdc7ed6cf36f6bd50b9ad087458fd49e047ec0.zip
MXT interface does not need an IRQ number; SAMA5D4-EK setup omitted I2C frequency
-rw-r--r--nuttx/configs/sama5d4-ek/src/sam_maxtouch.c1
-rw-r--r--nuttx/include/nuttx/input/mxt.h8
2 files changed, 1 insertions, 8 deletions
diff --git a/nuttx/configs/sama5d4-ek/src/sam_maxtouch.c b/nuttx/configs/sama5d4-ek/src/sam_maxtouch.c
index 7b5ae344e..7a8fb3965 100644
--- a/nuttx/configs/sama5d4-ek/src/sam_maxtouch.c
+++ b/nuttx/configs/sama5d4-ek/src/sam_maxtouch.c
@@ -128,6 +128,7 @@ static struct sama5d4ek_tscinfo_s g_mxtinfo =
{
.lower =
{
+ .address = (0x4c >> 1),
.frequency = CONFIG_SAMA5D4EK_MXT_I2CFREQUENCY,
.attach = mxt_attach,
diff --git a/nuttx/include/nuttx/input/mxt.h b/nuttx/include/nuttx/input/mxt.h
index a1d48e75d..5563758a2 100644
--- a/nuttx/include/nuttx/input/mxt.h
+++ b/nuttx/include/nuttx/input/mxt.h
@@ -123,14 +123,6 @@ struct mxt_lower_s
uint8_t address; /* 7-bit I2C address (only bits 0-6 used) */
uint32_t frequency; /* I2C frequency */
-#ifndef CONFIG_MXT_MULTIPLE
- /* If multiple MXT devices are supported, then an IRQ number must
- * be provided for each so that their interrupts can be distinguished.
- */
-
- int irq; /* IRQ number received by interrupt handler. */
-#endif
-
/* True: Swap X and Y values */
bool swapxy;