summaryrefslogtreecommitdiff
path: root/nuttx/configs
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/configs')
-rw-r--r--nuttx/configs/zkit-arm-1769/src/up_adc.c2
-rw-r--r--nuttx/configs/zkit-arm-1769/src/up_dac.c1
-rw-r--r--nuttx/configs/zkit-arm-1769/src/up_lcd.c2
-rw-r--r--nuttx/configs/zkit-arm-1769/src/up_nsh.c3
-rw-r--r--nuttx/configs/zkit-arm-1769/src/up_usbmsc.c3
-rw-r--r--nuttx/configs/zkit-arm-1769/src/zkitarm_internal.h14
6 files changed, 21 insertions, 4 deletions
diff --git a/nuttx/configs/zkit-arm-1769/src/up_adc.c b/nuttx/configs/zkit-arm-1769/src/up_adc.c
index 1e7b9b7da..b76cdfbc7 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_adc.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_adc.c
@@ -54,7 +54,7 @@
#include "chip.h"
#include "up_arch.h"
-#include "lpc17_pwm.h"
+#include "lpc17_adc.h"
#include "zkitarm_internal.h"
#ifdef CONFIG_ADC
diff --git a/nuttx/configs/zkit-arm-1769/src/up_dac.c b/nuttx/configs/zkit-arm-1769/src/up_dac.c
index a6f5db7ce..5d66c56f3 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_dac.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_dac.c
@@ -55,6 +55,7 @@
#include "up_internal.h"
#include "zkitarm_internal.h"
+#include "lpc17_dac.h"
#ifdef CONFIG_DAC
diff --git a/nuttx/configs/zkit-arm-1769/src/up_lcd.c b/nuttx/configs/zkit-arm-1769/src/up_lcd.c
index 3f34683f6..e29996b31 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_lcd.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_lcd.c
@@ -53,11 +53,13 @@
#include <nuttx/spi.h>
#include <nuttx/lcd/lcd.h>
#include <nuttx/lcd/st7567.h>
+#include <nuttx/arch.h>
#include "up_arch.h"
#include "up_internal.h"
#include "lpc17_gpio.h"
+#include "lpc17_ssp.h"
#include "zkitarm_internal.h"
#ifdef CONFIG_NX_LCDDRIVER
diff --git a/nuttx/configs/zkit-arm-1769/src/up_nsh.c b/nuttx/configs/zkit-arm-1769/src/up_nsh.c
index 78fddc035..63553e532 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_nsh.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_nsh.c
@@ -51,6 +51,7 @@
#include <nuttx/spi.h>
#include <nuttx/mmcsd.h>
+#include "lpc17_spi.h"
/****************************************************************************
* Pre-Processor Definitions
@@ -148,7 +149,7 @@ int nsh_archinitialize(void)
/* Get the SSP port */
- ssp = lpc17_sspinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
+ ssp = lpc17_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
if (!ssp)
{
message("nsh_archinitialize: Failed to initialize SSP port %d\n",
diff --git a/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c b/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c
index 8873c39f4..60f3e2dc2 100644
--- a/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c
+++ b/nuttx/configs/zkit-arm-1769/src/up_usbmsc.c
@@ -53,6 +53,9 @@
#include <nuttx/spi.h>
#include <nuttx/mmcsd.h>
+#include "lpc17_spi.h"
+#include "zkitarm_internal.h"
+
/****************************************************************************
* Pre-Processor Definitions
****************************************************************************/
diff --git a/nuttx/configs/zkit-arm-1769/src/zkitarm_internal.h b/nuttx/configs/zkit-arm-1769/src/zkitarm_internal.h
index b666c8387..6a4542c4b 100644
--- a/nuttx/configs/zkit-arm-1769/src/zkitarm_internal.h
+++ b/nuttx/configs/zkit-arm-1769/src/zkitarm_internal.h
@@ -145,7 +145,7 @@
#define ZKITARM_KEY4 (GPIO_INPUT | GPIO_FLOAT | GPIO_PORT1 | GPIO_PIN31)
#define ZKITARM_KEY5 (GPIO_INPUT | GPIO_FLOAT | GPIO_PORT2 | GPIO_PIN13)
-#define ZKITARM_INT_KEY5 (GPIO_INTBOTH | GPIO_FLOAT | GPIO_PORT2 | GPIO_PIN13)
+#define ZKITARM_INT_KEY5 (GPIO_INTFE | GPIO_FLOAT | GPIO_PORT2 | GPIO_PIN13)
#define ZKITARM_KEY5_IRQ LPC17_IRQ_P2p13
/* SD Slot
@@ -234,11 +234,21 @@
* Name: zkit_sspinitialize
*
* Description:
- * Called to configure SPI chip select GPIO pins for the LPCXpresso board.
+ * Called to configure SSP chip select GPIO pins for the ZKit-ARM-1769 board.
*
************************************************************************************/
void weak_function zkit_sspinitialize(void);
+/************************************************************************************
+ * Name: zkit_spinitialize
+ *
+ * Description:
+ * Called to configure SPI chip select GPIO pins for the ZKit-ARM-1769 board.
+ *
+ ************************************************************************************/
+
+void weak_function zkit_spiinitialize(void);
+
#endif /* __ASSEMBLY__ */
#endif /* _CONFIGS_ZKITARM_LPC1768_SRC_ZKITARM_INTERNAL_H */