summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-06-15 00:44:59 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-06-15 00:44:59 +0000
commit3c6eec9b567877112b8360221b8c01a9edfa1d7d (patch)
treeebdf64c7c30c222b043677c065e126327b70d090
parent18d204c90803d2622cc0dd0fdff57f5b398df18a (diff)
downloadnuttx-3c6eec9b567877112b8360221b8c01a9edfa1d7d.tar.gz
nuttx-3c6eec9b567877112b8360221b8c01a9edfa1d7d.tar.bz2
nuttx-3c6eec9b567877112b8360221b8c01a9edfa1d7d.zip
typosarch/arm/src/lpc17xx/lpc17_spi.h
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2747 42af7a65-404d-4744-a932-0658087f49c3
-rwxr-xr-xnuttx/arch/arm/src/lpc17xx/lpc17_ssp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
index fcfd675ec..a015932e9 100755
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
@@ -696,7 +696,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
lpc17_configgpio(GPIO_SSP0_MOSI);
#endif
-#ifdef CONFIG_LPC17_SSP0
+#ifdef CONFIG_LPC17_SSP1
lpc17_configgpio(GPIO_SSP1_SCK);
lpc17_configgpio(GPIO_SSP1_MISO);
lpc17_configgpio(GPIO_SSP1_MOSI);
@@ -711,7 +711,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
putreg32(regval, LPC17_SYSCON_PCLKSEL1);
#endif
-#ifdef CONFIG_LPC17_SSP0
+#ifdef CONFIG_LPC17_SSP1
regval = getreg32(LPC17_SYSCON_PCLKSEL0);
regval &= ~SYSCON_PCLKSEL0_SSP1_MASK;
regval |= (SSP_PCLKSET_DIV << SYSCON_PCLKSEL0_SSP1_SHIFT);
@@ -724,7 +724,8 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
regval &= ~(SYSCON_PCONP_PCSSP0|SYSCON_PCONP_PCSSP1);
#ifdef CONFIG_LPC17_SSP0
regval |= SYSCON_PCONP_PCSSP0;
-#else
+#endif
+#ifdef CONFIG_LPC17_SSP1
regval |= SYSCON_PCONP_PCSSP1;
#endif
putreg32(regval, LPC17_SYSCON_PCONP);