For Tiva/LM MCUs, rename up_spiinitialize to tiva_spibus_initialize

This commit is contained in:
Gregory Nutt 2016-01-26 15:20:24 -06:00
parent e792b09830
commit 5a650d94a0
32 changed files with 97 additions and 97 deletions

View File

@ -72,15 +72,15 @@
void tiva_boardinitialize(void) void tiva_boardinitialize(void)
{ {
/* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function
* lm_ssiinitialize() has been brought into the link. * lm_spidev_initialize() has been brought into the link.
*/ */
/* The Eagle100 microSD CS is on SSI0 */ /* The Eagle100 microSD CS is on SSI0 */
#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */ #if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
if (lm_ssiinitialize) if (lm_spidev_initialize)
{ {
lm_ssiinitialize(); lm_spidev_initialize();
} }
#endif #endif

View File

@ -113,7 +113,7 @@ int board_app_initialize(void)
syslog(LOG_INFO, "Initializing SPI port %d\n", syslog(LOG_INFO, "Initializing SPI port %d\n",
CONFIG_NSH_MMCSDSPIPORTNO); CONFIG_NSH_MMCSDSPIPORTNO);
spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO); spi = tiva_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
if (!spi) if (!spi)
{ {
syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n", syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",

View File

@ -94,35 +94,35 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: lm_ssiinitialize * Name: lm_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the Eagle100 board. * Called to configure SPI chip select GPIO pins for the Eagle100 board.
* *
************************************************************************************/ ************************************************************************************/
void weak_function lm_ssiinitialize(void) void weak_function lm_spidev_initialize(void)
{ {
/* Configure the SPI-based microSD CS GPIO */ /* Configure the SPI-based microSD CS GPIO */
ssi_dumpgpio("lm_ssiinitialize() before tiva_configgpio()"); ssi_dumpgpio("lm_spidev_initialize() before tiva_configgpio()");
tiva_configgpio(SDCCS_GPIO); tiva_configgpio(SDCCS_GPIO);
ssi_dumpgpio("lm_ssiinitialize() after tiva_configgpio()"); ssi_dumpgpio("lm_spidev_initialize() after tiva_configgpio()");
} }
/**************************************************************************** /****************************************************************************
* The external functions, tiva_spiselect and tiva_spistatus must be provided * The external functions, tiva_spiselect and tiva_spistatus must be provided
* by board-specific logic. The are implementations of the select and status * by board-specific logic. The are implementations of the select and status
* methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
* All othermethods (including up_spiinitialize()) are provided by common * All othermethods (including tiva_spibus_initialize()) are provided by common
* logic. To use this common SPI logic on your board: * logic. To use this common SPI logic on your board:
* *
* 1. Provide tiva_spiselect() and tiva_spistatus() functions in your * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your
* board-specific logic. This function will perform chip selection and * board-specific logic. This function will perform chip selection and
* status operations using GPIOs in the way your board is configured. * status operations using GPIOs in the way your board is configured.
* 2. Add a call to up_spiinitialize() in your low level initialization * 2. Add a call to tiva_spibus_initialize() in your low level initialization
* logic * logic
* 3. The handle returned by up_spiinitialize() may then be used to bind the * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the
* SPI driver to higher level logic (e.g., calling * SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to * mmcsd_spislotinitialize(), for example, will bind the SPI driver to
* the SPI MMC/SD driver). * the SPI MMC/SD driver).

View File

@ -74,13 +74,13 @@
void tiva_boardinitialize(void) void tiva_boardinitialize(void)
{ {
/* Configure chip selects if 1) SSI is not disabled, and 2) the weak function /* Configure chip selects if 1) SSI is not disabled, and 2) the weak function
* lm_ssiinitialize() has been brought into the link. * lm_spidev_initialize() has been brought into the link.
*/ */
#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1) #if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
if (lm_ssiinitialize) if (lm_spidev_initialize)
{ {
lm_ssiinitialize(); lm_spidev_initialize();
} }
#endif #endif

View File

@ -95,19 +95,19 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: lm_ssiinitialize * Name: lm_spidev_initialize
* *
* Description: * Description:
* Called to configure chip select GPIO pins for the LM3S9B96 Eval board. * Called to configure chip select GPIO pins for the LM3S9B96 Eval board.
* *
************************************************************************************/ ************************************************************************************/
void weak_function lm_ssiinitialize(void) void weak_function lm_spidev_initialize(void)
{ {
/* Configure the CS GPIO */ /* Configure the CS GPIO */
#if 0 #if 0
ssi_dumpgpio("lm_ssiinitialize() Entry"); ssi_dumpgpio("lm_spidev_initialize() Entry");
ssi_dumpgpio("lm_ssiinitialize() Exit"); ssi_dumpgpio("lm_spidev_initialize() Exit");
#endif #endif
} }
@ -116,15 +116,15 @@ void weak_function lm_ssiinitialize(void)
* The external functions, tiva_spiselect and tiva_spistatus must be provided * The external functions, tiva_spiselect and tiva_spistatus must be provided
* by board-specific logic. The are implementations of the select and status * by board-specific logic. The are implementations of the select and status
* methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
* All othermethods (including up_spiinitialize()) are provided by common * All othermethods (including tiva_spibus_initialize()) are provided by common
* logic. To use this common SPI logic on your board: * logic. To use this common SPI logic on your board:
* *
* 1. Provide tiva_spiselect() and tiva_spistatus() functions in your * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your
* board-specific logic. This function will perform chip selection and * board-specific logic. This function will perform chip selection and
* status operations using GPIOs in the way your board is configured. * status operations using GPIOs in the way your board is configured.
* 2. Add a call to up_spiinitialize() in your low level initialization * 2. Add a call to tiva_spibus_initialize() in your low level initialization
* logic * logic
* 3. The handle returned by up_spiinitialize() may then be used to bind the * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the
* SPI driver to higher level logic (e.g., calling * SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to * mmcsd_spislotinitialize(), for example, will bind the SPI driver to
* the SPI MMC/SD driver). * the SPI MMC/SD driver).

View File

@ -92,35 +92,35 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: lm_ssiinitialize * Name: lm_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the MDL-S2E. * Called to configure SPI chip select GPIO pins for the MDL-S2E.
* *
************************************************************************************/ ************************************************************************************/
void weak_function lm_ssiinitialize(void) void weak_function lm_spidev_initialize(void)
{ {
/* Configure the SPI CS GPIO */ /* Configure the SPI CS GPIO */
ssi_dumpgpio("lm_ssiinitialize() Entry)"); ssi_dumpgpio("lm_spidev_initialize() Entry)");
tiva_configgpio(SSICS_GPIO); tiva_configgpio(SSICS_GPIO);
ssi_dumpgpio("lm_ssiinitialize() Exit"); ssi_dumpgpio("lm_spidev_initialize() Exit");
} }
/**************************************************************************** /****************************************************************************
* The external functions, tiva_spiselect and tiva_spistatus must be provided * The external functions, tiva_spiselect and tiva_spistatus must be provided
* by board-specific logic. The are implementations of the select and status * by board-specific logic. The are implementations of the select and status
* methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
* All othermethods (including up_spiinitialize()) are provided by common * All othermethods (including tiva_spibus_initialize()) are provided by common
* logic. To use this common SPI logic on your board: * logic. To use this common SPI logic on your board:
* *
* 1. Provide tiva_spiselect() and tiva_spistatus() functions in your * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your
* board-specific logic. This function will perform chip selection and * board-specific logic. This function will perform chip selection and
* status operations using GPIOs in the way your board is configured. * status operations using GPIOs in the way your board is configured.
* 2. Add a call to up_spiinitialize() in your low level initialization * 2. Add a call to tiva_spibus_initialize() in your low level initialization
* logic * logic
* 3. The handle returned by up_spiinitialize() may then be used to bind the * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the
* SPI driver to higher level logic (e.g., calling * SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to * mmcsd_spislotinitialize(), for example, will bind the SPI driver to
* the SPI MMC/SD driver). * the SPI MMC/SD driver).

View File

@ -73,15 +73,15 @@
void tiva_boardinitialize(void) void tiva_boardinitialize(void)
{ {
/* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function
* lm_ssiinitialize() has been brought into the link. * lm_spidev_initialize() has been brought into the link.
*/ */
/* The LM3S6965 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */ /* The LM3S6965 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */
#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */ #if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
if (lm_ssiinitialize) if (lm_spidev_initialize)
{ {
lm_ssiinitialize(); lm_spidev_initialize();
} }
#endif #endif

View File

@ -117,7 +117,7 @@ int board_app_initialize(void)
syslog(LOG_INFO, "Initializing SPI port %d\n", syslog(LOG_INFO, "Initializing SPI port %d\n",
CONFIG_NSH_MMCSDSPIPORTNO); CONFIG_NSH_MMCSDSPIPORTNO);
spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO); spi = tiva_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
if (!spi) if (!spi)
{ {
syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n", syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",

View File

@ -109,7 +109,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
/* Get the SSI port (configure as a Freescale SPI port) */ /* Get the SSI port (configure as a Freescale SPI port) */
spi = up_spiinitialize(0); spi = tiva_spibus_initialize(0);
if (!spi) if (!spi)
{ {
glldbg("Failed to initialize SSI port 0\n"); glldbg("Failed to initialize SSI port 0\n");

View File

@ -94,38 +94,38 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: tiva_ssiinitialize * Name: tiva_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the LM3S6965 Eval Kit. * Called to configure SPI chip select GPIO pins for the LM3S6965 Eval Kit.
* *
************************************************************************************/ ************************************************************************************/
void weak_function lm_ssiinitialize(void) void weak_function lm_spidev_initialize(void)
{ {
/* Configure the SPI-based microSD CS GPIO */ /* Configure the SPI-based microSD CS GPIO */
ssi_dumpgpio("lm_ssiinitialize() Entry)"); ssi_dumpgpio("lm_spidev_initialize() Entry)");
tiva_configgpio(SDCCS_GPIO); tiva_configgpio(SDCCS_GPIO);
#ifdef CONFIG_NX_LCDDRIVER #ifdef CONFIG_NX_LCDDRIVER
tiva_configgpio(OLEDCS_GPIO); tiva_configgpio(OLEDCS_GPIO);
#endif #endif
ssi_dumpgpio("lm_ssiinitialize() Exit"); ssi_dumpgpio("lm_spidev_initialize() Exit");
} }
/**************************************************************************** /****************************************************************************
* The external functions, tiva_spiselect and tiva_spistatus must be provided * The external functions, tiva_spiselect and tiva_spistatus must be provided
* by board-specific logic. The are implementations of the select and status * by board-specific logic. The are implementations of the select and status
* methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
* All othermethods (including up_spiinitialize()) are provided by common * All othermethods (including tiva_spibus_initialize()) are provided by common
* logic. To use this common SPI logic on your board: * logic. To use this common SPI logic on your board:
* *
* 1. Provide tiva_spiselect() and tiva_spistatus() functions in your * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your
* board-specific logic. This function will perform chip selection and * board-specific logic. This function will perform chip selection and
* status operations using GPIOs in the way your board is configured. * status operations using GPIOs in the way your board is configured.
* 2. Add a call to up_spiinitialize() in your low level initialization * 2. Add a call to tiva_spibus_initialize() in your low level initialization
* logic * logic
* 3. The handle returned by up_spiinitialize() may then be used to bind the * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the
* SPI driver to higher level logic (e.g., calling * SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to * mmcsd_spislotinitialize(), for example, will bind the SPI driver to
* the SPI MMC/SD driver). * the SPI MMC/SD driver).

View File

@ -73,15 +73,15 @@
void tiva_boardinitialize(void) void tiva_boardinitialize(void)
{ {
/* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SSI is not disabled, and 2) the weak function
* lm_ssiinitialize() has been brought into the link. * lm_spidev_initialize() has been brought into the link.
*/ */
/* The LM3S8962 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */ /* The LM3S8962 Eval Kit microSD CS and OLED are on SSI0 (Duh! There is no SSI1) */
#if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */ #if defined(CONFIG_TIVA_SSI0) /* || defined(CONFIG_TIVA_SSI1) */
if (lm_ssiinitialize) if (lm_spidev_initialize)
{ {
lm_ssiinitialize(); lm_spidev_initialize();
} }
#endif #endif

View File

@ -116,7 +116,7 @@ int board_app_initialize(void)
syslog(LOG_INFO, "Initializing SPI port %d\n", syslog(LOG_INFO, "Initializing SPI port %d\n",
CONFIG_NSH_MMCSDSPIPORTNO); CONFIG_NSH_MMCSDSPIPORTNO);
spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO); spi = tiva_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
if (!spi) if (!spi)
{ {
syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n", syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",

View File

@ -109,7 +109,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
/* Get the SSI port (configure as a Freescale SPI port) */ /* Get the SSI port (configure as a Freescale SPI port) */
spi = up_spiinitialize(0); spi = tiva_spibus_initialize(0);
if (!spi) if (!spi)
{ {
glldbg("Failed to initialize SSI port 0\n"); glldbg("Failed to initialize SSI port 0\n");

View File

@ -94,38 +94,38 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: tiva_ssiinitialize * Name: tiva_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the LM3S8962 Eval Kit. * Called to configure SPI chip select GPIO pins for the LM3S8962 Eval Kit.
* *
************************************************************************************/ ************************************************************************************/
void weak_function lm_ssiinitialize(void) void weak_function lm_spidev_initialize(void)
{ {
/* Configure the SPI-based microSD CS GPIO */ /* Configure the SPI-based microSD CS GPIO */
ssi_dumpgpio("lm_ssiinitialize() Entry)"); ssi_dumpgpio("lm_spidev_initialize() Entry)");
tiva_configgpio(SDCCS_GPIO); tiva_configgpio(SDCCS_GPIO);
#ifdef CONFIG_NX_LCDDRIVER #ifdef CONFIG_NX_LCDDRIVER
tiva_configgpio(OLEDCS_GPIO); tiva_configgpio(OLEDCS_GPIO);
#endif #endif
ssi_dumpgpio("lm_ssiinitialize() Exit"); ssi_dumpgpio("lm_spidev_initialize() Exit");
} }
/**************************************************************************** /****************************************************************************
* The external functions, tiva_spiselect and tiva_spistatus must be provided * The external functions, tiva_spiselect and tiva_spistatus must be provided
* by board-specific logic. The are implementations of the select and status * by board-specific logic. The are implementations of the select and status
* methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h). * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
* All othermethods (including up_spiinitialize()) are provided by common * All othermethods (including tiva_spibus_initialize()) are provided by common
* logic. To use this common SPI logic on your board: * logic. To use this common SPI logic on your board:
* *
* 1. Provide tiva_spiselect() and tiva_spistatus() functions in your * 1. Provide tiva_spiselect() and tiva_spistatus() functions in your
* board-specific logic. This function will perform chip selection and * board-specific logic. This function will perform chip selection and
* status operations using GPIOs in the way your board is configured. * status operations using GPIOs in the way your board is configured.
* 2. Add a call to up_spiinitialize() in your low level initialization * 2. Add a call to tiva_spibus_initialize() in your low level initialization
* logic * logic
* 3. The handle returned by up_spiinitialize() may then be used to bind the * 3. The handle returned by tiva_spibus_initialize() may then be used to bind the
* SPI driver to higher level logic (e.g., calling * SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to * mmcsd_spislotinitialize(), for example, will bind the SPI driver to
* the SPI MMC/SD driver). * the SPI MMC/SD driver).

View File

@ -212,14 +212,14 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: sam_spiinitialize * Name: sam_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the SAM3U-EK board. * Called to configure SPI chip select GPIO pins for the SAM3U-EK board.
* *
************************************************************************************/ ************************************************************************************/
void weak_function sam_spiinitialize(void); void weak_function sam_spidev_initialize(void);
/************************************************************************************ /************************************************************************************
* Name: sam_hsmciinit * Name: sam_hsmciinit

View File

@ -72,13 +72,13 @@
void sam_boardinitialize(void) void sam_boardinitialize(void)
{ {
/* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
* sam_spiinitialize() has been brought into the link. * sam_spidev_initialize() has been brought into the link.
*/ */
#ifdef CONFIG_SAM34_SPI0 #ifdef CONFIG_SAM34_SPI0
if (sam_spiinitialize) if (sam_spidev_initialize)
{ {
sam_spiinitialize(); sam_spidev_initialize();
} }
#endif #endif

View File

@ -377,14 +377,14 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: sam_spiinitialize * Name: sam_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the SAM4E-EK board. * Called to configure SPI chip select GPIO pins for the SAM4E-EK board.
* *
************************************************************************************/ ************************************************************************************/
void weak_function sam_spiinitialize(void); void weak_function sam_spidev_initialize(void);
/************************************************************************************ /************************************************************************************
* Name: sam_hsmci_initialize * Name: sam_hsmci_initialize

View File

@ -101,13 +101,13 @@ void sam_boardinitialize(void)
board_config_usart1(); board_config_usart1();
/* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
* sam_spiinitialize() has been brought into the link. * sam_spidev_initialize() has been brought into the link.
*/ */
#ifdef CONFIG_SAM34_SPI0 #ifdef CONFIG_SAM34_SPI0
if (sam_spiinitialize) if (sam_spidev_initialize)
{ {
sam_spiinitialize(); sam_spidev_initialize();
} }
#endif #endif

View File

@ -323,14 +323,14 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: sam_spiinitialize * Name: sam_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select GPIO pins for the SAM3U-EK board. * Called to configure SPI chip select GPIO pins for the SAM3U-EK board.
* *
************************************************************************************/ ************************************************************************************/
void weak_function sam_spiinitialize(void); void weak_function sam_spidev_initialize(void);
/************************************************************************************ /************************************************************************************
* Name: sam_sdinitialize * Name: sam_sdinitialize

View File

@ -70,13 +70,13 @@
void sam_boardinitialize(void) void sam_boardinitialize(void)
{ {
/* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
* sam_spiinitialize() has been brought into the link. * sam_spidev_initialize() has been brought into the link.
*/ */
#ifdef CONFIG_SAM34_SPI0 #ifdef CONFIG_SAM34_SPI0
if (sam_spiinitialize) if (sam_spidev_initialize)
{ {
sam_spiinitialize(); sam_spidev_initialize();
} }
#endif #endif

View File

@ -77,13 +77,13 @@ void sam_boardinitialize(void)
#endif #endif
/* Configure SPI chip selects if 1) SPI is enable, and 2) the weak function /* Configure SPI chip selects if 1) SPI is enable, and 2) the weak function
* sam_spiinitialize() has been brought into the link. * sam_spidev_initialize() has been brought into the link.
*/ */
#if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1) #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1)
if (sam_spiinitialize) if (sam_spidev_initialize)
{ {
sam_spiinitialize(); sam_spidev_initialize();
} }
#endif #endif

View File

@ -605,7 +605,7 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: sam_spiinitialize * Name: sam_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select PIO pins for the SAMA5D3-Xplained board. * Called to configure SPI chip select PIO pins for the SAMA5D3-Xplained board.
@ -613,7 +613,7 @@
************************************************************************************/ ************************************************************************************/
#if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1) #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1)
void weak_function sam_spiinitialize(void); void weak_function sam_spidev_initialize(void);
#endif #endif
/************************************************************************************ /************************************************************************************

View File

@ -77,13 +77,13 @@ void sam_boardinitialize(void)
#endif #endif
/* Configure SPI chip selects if 1) SPI is enable, and 2) the weak function /* Configure SPI chip selects if 1) SPI is enable, and 2) the weak function
* sam_spiinitialize() has been brought into the link. * sam_spidev_initialize() has been brought into the link.
*/ */
#if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1) #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1)
if (sam_spiinitialize) if (sam_spidev_initialize)
{ {
sam_spiinitialize(); sam_spidev_initialize();
} }
#endif #endif

View File

@ -675,7 +675,7 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: sam_spiinitialize * Name: sam_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select PIO pins for the SAMA5D3x-EK board. * Called to configure SPI chip select PIO pins for the SAMA5D3x-EK board.
@ -683,7 +683,7 @@
************************************************************************************/ ************************************************************************************/
#if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1) #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1)
void weak_function sam_spiinitialize(void); void weak_function sam_spidev_initialize(void);
#endif #endif
/************************************************************************************ /************************************************************************************

View File

@ -77,14 +77,14 @@ void sam_boardinitialize(void)
#endif #endif
/* Configure SPI chip selects if 1) SPI is enable, and 2) the weak function /* Configure SPI chip selects if 1) SPI is enable, and 2) the weak function
* sam_spiinitialize() has been brought into the link. * sam_spidev_initialize() has been brought into the link.
*/ */
#if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1) || \ #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1) || \
defined(CONFIG_SAMA5_SPI2) defined(CONFIG_SAMA5_SPI2)
if (sam_spiinitialize) if (sam_spidev_initialize)
{ {
sam_spiinitialize(); sam_spidev_initialize();
} }
#endif #endif

View File

@ -877,7 +877,7 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: sam_spiinitialize * Name: sam_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select PIO pins for the SAMA5D4-EK board. * Called to configure SPI chip select PIO pins for the SAMA5D4-EK board.
@ -885,7 +885,7 @@
************************************************************************************/ ************************************************************************************/
#if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1) #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1)
void weak_function sam_spiinitialize(void); void weak_function sam_spidev_initialize(void);
#endif #endif
/************************************************************************************ /************************************************************************************

View File

@ -71,13 +71,13 @@
void sam_boardinitialize(void) void sam_boardinitialize(void)
{ {
/* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
* sam_spiinitialize() has been brought into the link. * sam_spidev_initialize() has been brought into the link.
*/ */
#ifdef SAMDL_HAVE_SPI #ifdef SAMDL_HAVE_SPI
if (sam_spiinitialize) if (sam_spidev_initialize)
{ {
sam_spiinitialize(); sam_spidev_initialize();
} }
#endif #endif

View File

@ -236,14 +236,14 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: sam_spiinitialize * Name: sam_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select PORT pins for the SAM3U-EK board. * Called to configure SPI chip select PORT pins for the SAM3U-EK board.
* *
************************************************************************************/ ************************************************************************************/
void weak_function sam_spiinitialize(void); void weak_function sam_spidev_initialize(void);
/************************************************************************************ /************************************************************************************
* Name: sam_sdinitialize * Name: sam_sdinitialize

View File

@ -71,13 +71,13 @@
void sam_boardinitialize(void) void sam_boardinitialize(void)
{ {
/* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
* sam_spiinitialize() has been brought into the link. * sam_spidev_initialize() has been brought into the link.
*/ */
#ifdef SAMDL_HAVE_SPI #ifdef SAMDL_HAVE_SPI
if (sam_spiinitialize) if (sam_spidev_initialize)
{ {
sam_spiinitialize(); sam_spidev_initialize();
} }
#endif #endif

View File

@ -236,14 +236,14 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: sam_spiinitialize * Name: sam_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select PORT pins for the SAM3U-EK board. * Called to configure SPI chip select PORT pins for the SAM3U-EK board.
* *
************************************************************************************/ ************************************************************************************/
void weak_function sam_spiinitialize(void); void weak_function sam_spidev_initialize(void);
/************************************************************************************ /************************************************************************************
* Name: sam_sdinitialize * Name: sam_sdinitialize

View File

@ -71,13 +71,13 @@
void sam_boardinitialize(void) void sam_boardinitialize(void)
{ {
/* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
* sam_spiinitialize() has been brought into the link. * sam_spidev_initialize() has been brought into the link.
*/ */
#ifdef SAMDL_HAVE_SPI #ifdef SAMDL_HAVE_SPI
if (sam_spiinitialize) if (sam_spidev_initialize)
{ {
sam_spiinitialize(); sam_spidev_initialize();
} }
#endif #endif

View File

@ -237,14 +237,14 @@
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: sam_spiinitialize * Name: sam_spidev_initialize
* *
* Description: * Description:
* Called to configure SPI chip select PORT pins for the SAM3U-EK board. * Called to configure SPI chip select PORT pins for the SAM3U-EK board.
* *
************************************************************************************/ ************************************************************************************/
void weak_function sam_spiinitialize(void); void weak_function sam_spidev_initialize(void);
/************************************************************************************ /************************************************************************************
* Name: sam_sdinitialize * Name: sam_sdinitialize