summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/calypso/calypso_armio.c
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/arch/arm/src/calypso/calypso_armio.c')
-rw-r--r--nuttx/arch/arm/src/calypso/calypso_armio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/calypso/calypso_armio.c b/nuttx/arch/arm/src/calypso/calypso_armio.c
index 59c5a79e7..56f049f94 100644
--- a/nuttx/arch/arm/src/calypso/calypso_armio.c
+++ b/nuttx/arch/arm/src/calypso/calypso_armio.c
@@ -41,6 +41,7 @@
#include <arch/calypso/memory.h>
#include <arch/calypso/armio.h>
+#include "up_arch.h"
/****************************************************************************
* HW access
@@ -92,10 +93,10 @@ static int kbd_gpio_irq(int irq, uint32_t *regs)
void calypso_armio(void)
{
/* Enable ARMIO clock */
- writew(1<<5, ARMIO_REG(CNTL_REG));
+ putreg16(1<<5, ARMIO_REG(CNTL_REG));
/* Mask GPIO interrupt and keypad interrupt */
- writew(KBD_INT|GPIO_INT, ARMIO_REG(KBD_GPIO_MASKIT));
+ putreg16(KBD_INT|GPIO_INT, ARMIO_REG(KBD_GPIO_MASKIT));
/* Attach and enable the interrupt */
irq_attach(IRQ_KEYPAD_GPIO, (xcpt_t)kbd_gpio_irq);