diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-04-01 15:02:22 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-04-01 15:02:22 +0000 |
| commit | 8a4cd2258a5f535f54abf86d6eb92aa000ac085b (patch) | |
| tree | de4e1fda591ec8134323065fa52ab6827ebc3dda /nuttx/configs/zkit-arm-1769/src/up_lcd.c | |
| parent | 9bd404cc67fe1ad52599e3a89036344d78cbdf55 (diff) | |
| download | px4-nuttx-8a4cd2258a5f535f54abf86d6eb92aa000ac085b.tar.gz px4-nuttx-8a4cd2258a5f535f54abf86d6eb92aa000ac085b.tar.bz2 px4-nuttx-8a4cd2258a5f535f54abf86d6eb92aa000ac085b.zip | |
LPC17xx SPI and SSP initialization functions both called up_spiinitialize(); Changed to lpc17_spinitialize() and lpc17_sspinitialize().
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5809 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/zkit-arm-1769/src/up_lcd.c')
| -rw-r--r-- | nuttx/configs/zkit-arm-1769/src/up_lcd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nuttx/configs/zkit-arm-1769/src/up_lcd.c b/nuttx/configs/zkit-arm-1769/src/up_lcd.c index d315131ee..c76566674 100644 --- a/nuttx/configs/zkit-arm-1769/src/up_lcd.c +++ b/nuttx/configs/zkit-arm-1769/src/up_lcd.c @@ -85,6 +85,7 @@ # define leddbg(x...) # define ledvdbg(x...) #endif + /**************************************************************************** * Private Data ****************************************************************************/ @@ -113,12 +114,13 @@ int up_lcdinitialize(void) lpc17_gpiowrite(ZKITARM_OLED_CS, 1); lpc17_gpiowrite(ZKITARM_OLED_RS, 1); - spi = up_spiinitialize(0); + spi = lpc17_sspinitialize(0); if (!spi) { glldbg("Failed to initialize SSI port 0\n"); return 0; } + lpc17_gpiowrite(ZKITARM_OLED_RST, 0); up_mdelay(1); lpc17_gpiowrite(ZKITARM_OLED_RST, 1); @@ -144,6 +146,7 @@ FAR struct lcd_dev_s *up_lcdgetdev(int lcddev) (void)dev->setpower(dev, CONFIG_LCD_MAXPOWER); return dev; } + return NULL; } |