diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-09 07:18:43 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-09 07:18:43 -0600 |
| commit | 46b3a8be57cecb0892505af782d883dd398a01b2 (patch) | |
| tree | be60268b99cdd81d78a586fae3e7d60d35d7b541 | |
| parent | f59cef7e9ebb5563f3c3bc4e10f53265953a25e6 (diff) | |
| download | px4-nuttx-46b3a8be57cecb0892505af782d883dd398a01b2.tar.gz px4-nuttx-46b3a8be57cecb0892505af782d883dd398a01b2.tar.bz2 px4-nuttx-46b3a8be57cecb0892505af782d883dd398a01b2.zip | |
SAMA5D44-EK: Cosmetic changes
| -rw-r--r-- | nuttx/configs/sama5d4-ek/src/Makefile | 4 | ||||
| -rw-r--r-- | nuttx/configs/sama5d4-ek/src/sam_maxtouch.c | 4 | ||||
| -rw-r--r-- | nuttx/configs/sama5d4-ek/src/sama5d4-ek.h | 11 |
3 files changed, 12 insertions, 7 deletions
diff --git a/nuttx/configs/sama5d4-ek/src/Makefile b/nuttx/configs/sama5d4-ek/src/Makefile index 484fab0b0..39779fea2 100644 --- a/nuttx/configs/sama5d4-ek/src/Makefile +++ b/nuttx/configs/sama5d4-ek/src/Makefile @@ -112,10 +112,6 @@ ifeq ($(CONFIG_PWM),y) CSRCS += sam_pwm.c endif -ifeq ($(CONFIG_CAN),y) -CSRCS += sam_can.c -endif - ifeq ($(CONFIG_USBMSC),y) CSRCS += sam_usbmsc.c endif diff --git a/nuttx/configs/sama5d4-ek/src/sam_maxtouch.c b/nuttx/configs/sama5d4-ek/src/sam_maxtouch.c index e1bdaa509..6a73fb4ce 100644 --- a/nuttx/configs/sama5d4-ek/src/sam_maxtouch.c +++ b/nuttx/configs/sama5d4-ek/src/sam_maxtouch.c @@ -120,9 +120,7 @@ static void mxt_clear(FAR const struct mxt_lower_s *lower); * of the maXTouch and provides some board-specific hooks. * * Memory for this structure is provided by the caller. It is not copied - * by the driver and is presumed to persist while the driver is active. The - * memory must be writable because, under certain circumstances, the driver - * may modify certain values. + * by the driver and is presumed to persist while the driver is active. */ static struct sama5d4ek_tscinfo_s g_mxtinfo = diff --git a/nuttx/configs/sama5d4-ek/src/sama5d4-ek.h b/nuttx/configs/sama5d4-ek/src/sama5d4-ek.h index e0506eea4..1cddca30a 100644 --- a/nuttx/configs/sama5d4-ek/src/sama5d4-ek.h +++ b/nuttx/configs/sama5d4-ek/src/sama5d4-ek.h @@ -394,6 +394,11 @@ PIO_INT_BOTHEDGES | PIO_PORT_PIOE | PIO_PIN25) #define IRQ_CHG_QT SAM_IRQ_PE25 +/* The touchscreen communicates on TWI0, I2C address 0x4c */ + +#define MXT_TWI_BUS 0 +#define MXT_I2C_ADDRESS 0x4c + /* HSMCI Card Slots *****************************************************************/ /* The SAMA4D4-EK provides a two SD memory card slots: (1) a full size SD * card slot (J10), and (2) a microSD memory card slot (J11). @@ -633,6 +638,12 @@ PIO_PORT_PIOC | PIO_PIN3) #define AT25_PORT SPI0_CS0 +/* ACT8865 power management chip ****************************************************/ +/* The PMIC communicates on TWI0, I2C address 0x5b */ + +#define PMIC_TWI_BUS 0 +#define PMIC_I2C_ADDRESS 0x5b + /************************************************************************************ * Public Types ************************************************************************************/ |