diff --git a/arch/arm/src/lpc11xx/lpc11_ssp.c b/arch/arm/src/lpc11xx/lpc11_ssp.c index 399f5a7c6cd..e6336b0af89 100644 --- a/arch/arm/src/lpc11xx/lpc11_ssp.c +++ b/arch/arm/src/lpc11xx/lpc11_ssp.c @@ -949,7 +949,7 @@ static inline FAR struct lpc11_sspdev_s *lpc11_ssp2initialize(void) ****************************************************************************/ /**************************************************************************** - * Name: lpc11_sspinitialize + * Name: lpc11_sspbus_initialize * * Description: * Initialize the selected SSP port. @@ -962,7 +962,7 @@ static inline FAR struct lpc11_sspdev_s *lpc11_ssp2initialize(void) * ****************************************************************************/ -FAR struct spi_dev_s *lpc11_sspinitialize(int port) +FAR struct spi_dev_s *lpc11_sspbus_initialize(int port) { FAR struct lpc11_sspdev_s *priv; uint32_t regval; diff --git a/arch/arm/src/lpc11xx/lpc11_ssp.h b/arch/arm/src/lpc11xx/lpc11_ssp.h index c9a06368ad5..9910650a300 100644 --- a/arch/arm/src/lpc11xx/lpc11_ssp.h +++ b/arch/arm/src/lpc11xx/lpc11_ssp.h @@ -71,7 +71,7 @@ extern "C" ************************************************************************************/ /************************************************************************************ - * Name: lpc11_sspinitialize + * Name: lpc11_sspbus_initialize * * Description: * Initialize the selected SSP port. @@ -84,7 +84,7 @@ extern "C" * ************************************************************************************/ -FAR struct spi_dev_s *lpc11_sspinitialize(int port); +FAR struct spi_dev_s *lpc11_sspbus_initialize(int port); /************************************************************************************ * Name: lpc11_ssp0/ssp1select, lpc11_ssp0/ssp1status, and lpc11_ssp0/ssp1cmddata @@ -93,7 +93,7 @@ FAR struct spi_dev_s *lpc11_sspinitialize(int port); * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods - * including lpc11_sspinitialize()) are provided by common LPC11xx logic. To use + * including lpc11_sspbus_initialize()) are provided by common LPC11xx logic. To use * this common SPI logic on your board: * * 1. Provide logic in lpc11_boardinitialize() to configure SSP chip select pins. @@ -104,9 +104,9 @@ FAR struct spi_dev_s *lpc11_sspinitialize(int port); * lpc11_ssp0/ssp1cmddata() functions in your board-specific logic. These * functions will perform cmd/data selection operations using GPIOs in the way * your board is configured. - * 3. Add a call to lpc11_sspinitialize() in your low level application + * 3. Add a call to lpc11_sspbus_initialize() in your low level application * initialization logic - * 4. The handle returned by lpc11_sspinitialize() may then be used to bind the + * 4. The handle returned by lpc11_sspbus_initialize() may then be used to bind the * SSP driver to higher level logic (e.g., calling mmcsd_spislotinitialize(), * for example, will bind the SSP driver to the SPI MMC/SD driver). * diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c index 40c0cb015d3..656ed4d185c 100644 --- a/arch/arm/src/lpc17xx/lpc17_ssp.c +++ b/arch/arm/src/lpc17xx/lpc17_ssp.c @@ -938,7 +938,7 @@ static inline FAR struct lpc17_sspdev_s *lpc17_ssp2initialize(void) ****************************************************************************/ /**************************************************************************** - * Name: lpc17_sspinitialize + * Name: lpc17_sspbus_initialize * * Description: * Initialize the selected SSP port. @@ -951,7 +951,7 @@ static inline FAR struct lpc17_sspdev_s *lpc17_ssp2initialize(void) * ****************************************************************************/ -FAR struct spi_dev_s *lpc17_sspinitialize(int port) +FAR struct spi_dev_s *lpc17_sspbus_initialize(int port) { FAR struct lpc17_sspdev_s *priv; uint32_t regval; diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.h b/arch/arm/src/lpc17xx/lpc17_ssp.h index 31e82096b00..6ea6375b131 100644 --- a/arch/arm/src/lpc17xx/lpc17_ssp.h +++ b/arch/arm/src/lpc17xx/lpc17_ssp.h @@ -71,7 +71,7 @@ extern "C" ************************************************************************************/ /************************************************************************************ - * Name: lpc17_sspinitialize + * Name: lpc17_sspbus_initialize * * Description: * Initialize the selected SSP port. @@ -84,7 +84,7 @@ extern "C" * ************************************************************************************/ -FAR struct spi_dev_s *lpc17_sspinitialize(int port); +FAR struct spi_dev_s *lpc17_sspbus_initialize(int port); /************************************************************************************ * Name: lpc17_ssp0/ssp1select, lpc17_ssp0/ssp1status, and lpc17_ssp0/ssp1cmddata @@ -93,7 +93,7 @@ FAR struct spi_dev_s *lpc17_sspinitialize(int port); * These external functions must be provided by board-specific logic. They are * implementations of the select, status, and cmddata methods of the SPI interface * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods - * including lpc17_sspinitialize()) are provided by common LPC17xx logic. To use + * including lpc17_sspbus_initialize()) are provided by common LPC17xx logic. To use * this common SPI logic on your board: * * 1. Provide logic in lpc17_boardinitialize() to configure SSP chip select pins. @@ -104,9 +104,9 @@ FAR struct spi_dev_s *lpc17_sspinitialize(int port); * lpc17_ssp0/ssp1cmddata() functions in your board-specific logic. These * functions will perform cmd/data selection operations using GPIOs in the way * your board is configured. - * 3. Add a call to lpc17_sspinitialize() in your low level application + * 3. Add a call to lpc17_sspbus_initialize() in your low level application * initialization logic - * 4. The handle returned by lpc17_sspinitialize() may then be used to bind the + * 4. The handle returned by lpc17_sspbus_initialize() may then be used to bind the * SSP driver to higher level logic (e.g., calling mmcsd_spislotinitialize(), * for example, will bind the SSP driver to the SPI MMC/SD driver). * diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c index 3fddcfb5337..32b5a459131 100644 --- a/arch/arm/src/lpc43xx/lpc43_spi.c +++ b/arch/arm/src/lpc43xx/lpc43_spi.c @@ -586,7 +586,7 @@ FAR struct spi_dev_s *lpc43_spibus_initialize(int port) if (port) { #if defined(CONFIG_LPC43_SSP0) || defined(CONFIG_LPC43_SSP1) - return lpc43_sspinitialize(port - 1); + return lpc43_sspbus_initialize(port - 1); #else return NULL; #endif diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c index 400373544bb..46034c29b74 100644 --- a/arch/arm/src/lpc43xx/lpc43_ssp.c +++ b/arch/arm/src/lpc43xx/lpc43_ssp.c @@ -784,7 +784,7 @@ static inline FAR struct lpc43_sspdev_s *lpc43_ssp1initialize(void) ****************************************************************************/ /**************************************************************************** - * Name: lpc43_sspinitialize + * Name: lpc43_sspbus_initialize * * Description: * Initialize the selected SSP port (0=SSP0, 1=SSP1) @@ -797,7 +797,7 @@ static inline FAR struct lpc43_sspdev_s *lpc43_ssp1initialize(void) * ****************************************************************************/ -FAR struct spi_dev_s *lpc43_sspinitialize(int port) +FAR struct spi_dev_s *lpc43_sspbus_initialize(int port) { FAR struct lpc43_sspdev_s *priv; uint32_t regval; diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.h b/arch/arm/src/lpc43xx/lpc43_ssp.h index cad52e3b68e..1c98618cbf6 100644 --- a/arch/arm/src/lpc43xx/lpc43_ssp.h +++ b/arch/arm/src/lpc43xx/lpc43_ssp.h @@ -60,8 +60,8 @@ * lpc43_ssp0/1cmddata() functions in your board-specific logic. These * functions 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_sspinitialize. - * 5. The handle returned by lpc43_sspinitialize() may then be used to bind the + * 4. Your low level board initialization logic should call lpc43_sspbus_initialize. + * 5. The handle returned by lpc43_sspbus_initialize() may then be used to bind the * SSP driver to higher level logic (e.g., calling mmcsd_spislotinitialize(), * for example, will bind the SPI driver to the SPI MMC/SD driver). */ @@ -90,7 +90,7 @@ extern "C" ************************************************************************************/ /**************************************************************************** - * Name: lpc43_sspinitialize + * Name: lpc43_sspbus_initialize * * Description: * Initialize the selected SSP port (0=SSP0, 1=SSP1) @@ -103,7 +103,7 @@ extern "C" * ****************************************************************************/ -FAR struct spi_dev_s *lpc43_sspinitialize(int port); +FAR struct spi_dev_s *lpc43_sspbus_initialize(int port); /************************************************************************************ * Name: lpc43_ssp0/1select, lpc43_ssp0/1status, and lpc43_ssp0/1cmddata