diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c index 86dc384a549..3fddcfb5337 100644 --- a/arch/arm/src/lpc43xx/lpc43_spi.c +++ b/arch/arm/src/lpc43xx/lpc43_spi.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/lpc43xx/lpc43_spi.c * - * Copyright (C) 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -509,11 +509,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw } /**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: lpc43_spiinitialize + * Name: lpc43_spiport_initialize * * Description: * Initialize the SPI port @@ -526,7 +522,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw * ****************************************************************************/ -FAR struct spi_dev_s *lpc43_spiinitialize(int port) +static FAR struct spi_dev_s *lpc43_spiport_initialize(int port) { FAR struct lpc43_spidev_s *priv = &g_spidev; @@ -565,7 +561,11 @@ FAR struct spi_dev_s *lpc43_spiinitialize(int port) #endif /* CONFIG_LPC43_SPI */ /**************************************************************************** - * Name: up_spiinitialize + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: lpc43_spibus_initialize * * Description: * Initialize the selected SPI port @@ -581,7 +581,7 @@ FAR struct spi_dev_s *lpc43_spiinitialize(int port) * ****************************************************************************/ -FAR struct spi_dev_s *up_spiinitialize(int port) +FAR struct spi_dev_s *lpc43_spibus_initialize(int port) { if (port) { @@ -594,7 +594,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port) else { #if defined(CONFIG_LPC43_SPI) - return lpc43_spiinitialize(port); + return lpc43_spiport_initialize(port); #else return NULL; #endif diff --git a/arch/arm/src/lpc43xx/lpc43_spi.h b/arch/arm/src/lpc43xx/lpc43_spi.h index 943c901cba9..42ade41b1a8 100644 --- a/arch/arm/src/lpc43xx/lpc43_spi.h +++ b/arch/arm/src/lpc43xx/lpc43_spi.h @@ -1,7 +1,7 @@ /************************************************************************************ * arch/arm/src/lpc43xx/lpc43_spi.h * - * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -60,8 +60,8 @@ * lpc43_spicmddata() functions in your board-specific logic. This * function will perform cmd/data selection operations using GPIOs in the * way your board is configured. - * 4. Your low level board initialization logic should call lpc43_sspiinitialize. - * 5. The handle returned by lpc43_spiinitialize() may then be used to bind the + * 4. Your low level board initialization logic should call lpc43_spibus_initialize. + * 5. The handle returned by lpc43_spibus_initialize() may then be used to bind the * SPI driver to higher level logic (e.g., calling mmcsd_spislotinitialize(), * for example, will bind the SPI driver to the SPI MMC/SD driver). */ @@ -89,21 +89,24 @@ extern "C" * Public Functions ************************************************************************************/ -/************************************************************************************ - * Name: lpc43_spiinitialize +/**************************************************************************** + * Name: lpc43_spibus_initialize * * Description: - * Initialize the SPI port + * Initialize the selected SPI port + * 0 - SPI + * 1 - SSP0 + * 2 - SSP1 * * Input Parameter: - * port Port number (must be zero) + * Port number (for hardware that has multiple SPI interfaces) * * Returned Value: - * Valid SPI device structure reference on succcess; a NULL on failure + * Valid SPI device structure reference on success; a NULL on failure * - ************************************************************************************/ + ****************************************************************************/ -FAR struct spi_dev_s *lpc43_spiinitialize(int port); +FAR struct spi_dev_s *lpc43_spibus_initialize(int port); /************************************************************************************ * Name: lpc43_spiselect, lpc43_spistatus, and lpc43_spicmddata