diff --git a/configs/arduino-due/README.txt b/configs/arduino-due/README.txt index d32b231a928..78b6d938253 100644 --- a/configs/arduino-due/README.txt +++ b/configs/arduino-due/README.txt @@ -1008,7 +1008,6 @@ Configuration sub-directories Device Drivers CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device CONFIG_SPI_BITBANG=y : Enable SPI bit-bang support CONFIG_MMCSD=y : Enable MMC/SD support @@ -1045,7 +1044,6 @@ Configuration sub-directories Device Drivers CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device CONFIG_SPI_BITBANG=y : Enable SPI bit-bang support CONFIG_INPUT=y : Enable support for input devices diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig index 28dc8b54d4c..c4cf0e84ae8 100644 --- a/configs/cloudctrl/nsh/defconfig +++ b/configs/cloudctrl/nsh/defconfig @@ -665,7 +665,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/compal_e86/nsh_highram/defconfig b/configs/compal_e86/nsh_highram/defconfig index 5db4d95dd41..04d4024438f 100644 --- a/configs/compal_e86/nsh_highram/defconfig +++ b/configs/compal_e86/nsh_highram/defconfig @@ -339,7 +339,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/compal_e88/nsh_highram/defconfig b/configs/compal_e88/nsh_highram/defconfig index 40fa13cddf8..c70599d4100 100644 --- a/configs/compal_e88/nsh_highram/defconfig +++ b/configs/compal_e88/nsh_highram/defconfig @@ -339,7 +339,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -CONFIG_SPI_OWNBUS=y CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/compal_e99/nsh_compalram/defconfig b/configs/compal_e99/nsh_compalram/defconfig index 3fd7486ee07..2c4c04fd8d6 100644 --- a/configs/compal_e99/nsh_compalram/defconfig +++ b/configs/compal_e99/nsh_compalram/defconfig @@ -341,7 +341,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -CONFIG_SPI_OWNBUS=y CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig index 0c311cce85d..0d35b4eb1e0 100644 --- a/configs/compal_e99/nsh_highram/defconfig +++ b/configs/compal_e99/nsh_highram/defconfig @@ -340,7 +340,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -CONFIG_SPI_OWNBUS=y CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig index d5d00f43bf8..b21f080af6d 100644 --- a/configs/ea3131/pgnsh/defconfig +++ b/configs/ea3131/pgnsh/defconfig @@ -384,7 +384,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set CONFIG_SPI_CALLBACK=y diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig index b2d6075fc54..8ccc0a0cf0a 100644 --- a/configs/eagle100/nsh/defconfig +++ b/configs/eagle100/nsh/defconfig @@ -456,7 +456,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set CONFIG_SPI_CALLBACK=y diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig index 9f8f9164344..391204849e5 100644 --- a/configs/ekk-lm3s9b96/nsh/defconfig +++ b/configs/ekk-lm3s9b96/nsh/defconfig @@ -445,7 +445,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set CONFIG_SPI_CALLBACK=y diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig index 542c3380135..7fbecfb6f7e 100644 --- a/configs/fire-stm32v2/nsh/defconfig +++ b/configs/fire-stm32v2/nsh/defconfig @@ -678,7 +678,6 @@ CONFIG_I2C_POLLED=y # CONFIG_I2C_RESET is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/freedom-kl25z/minnsh/defconfig b/configs/freedom-kl25z/minnsh/defconfig index ecdf42074c9..045b3b04a88 100644 --- a/configs/freedom-kl25z/minnsh/defconfig +++ b/configs/freedom-kl25z/minnsh/defconfig @@ -330,7 +330,6 @@ CONFIG_DISABLE_POLL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_BITBANG is not set diff --git a/configs/freedom-kl26z/minnsh/defconfig b/configs/freedom-kl26z/minnsh/defconfig index 8f6da4e4104..3c7d57215d9 100644 --- a/configs/freedom-kl26z/minnsh/defconfig +++ b/configs/freedom-kl26z/minnsh/defconfig @@ -333,7 +333,6 @@ CONFIG_DISABLE_POLL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_BITBANG is not set diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig index 2cd64246ff4..2207f8e51e6 100644 --- a/configs/hymini-stm32v/nsh2/defconfig +++ b/configs/hymini-stm32v/nsh2/defconfig @@ -606,7 +606,6 @@ CONFIG_DEV_NULL=y CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y -CONFIG_SPI_OWNBUS=y CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/launchxl-tms57004/nsh/defconfig b/configs/launchxl-tms57004/nsh/defconfig index a3b703ab040..30f4ce8dee4 100644 --- a/configs/launchxl-tms57004/nsh/defconfig +++ b/configs/launchxl-tms57004/nsh/defconfig @@ -383,7 +383,6 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_TRACE is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig index 786c07c9124..0f727678003 100644 --- a/configs/lm3s6965-ek/discover/defconfig +++ b/configs/lm3s6965-ek/discover/defconfig @@ -450,7 +450,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set CONFIG_SPI_CALLBACK=y diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig index 786c07c9124..0f727678003 100644 --- a/configs/lm3s6965-ek/nsh/defconfig +++ b/configs/lm3s6965-ek/nsh/defconfig @@ -450,7 +450,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set CONFIG_SPI_CALLBACK=y diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig index f988f26ff4c..31b175e45b8 100644 --- a/configs/lm3s6965-ek/nx/defconfig +++ b/configs/lm3s6965-ek/nx/defconfig @@ -423,7 +423,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y CONFIG_SPI_CMDDATA=y # CONFIG_SPI_CALLBACK is not set diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig index f442d00c58a..62bcf135178 100644 --- a/configs/lm3s8962-ek/nsh/defconfig +++ b/configs/lm3s8962-ek/nsh/defconfig @@ -460,7 +460,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set CONFIG_SPI_CALLBACK=y diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig index 0f76c5ab631..cf08f46b9e9 100644 --- a/configs/lm3s8962-ek/nx/defconfig +++ b/configs/lm3s8962-ek/nx/defconfig @@ -433,7 +433,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y CONFIG_SPI_CMDDATA=y # CONFIG_SPI_CALLBACK is not set diff --git a/configs/lpc4337-ws/nsh/defconfig b/configs/lpc4337-ws/nsh/defconfig index 92fc901efb2..51b3cd65153 100644 --- a/configs/lpc4337-ws/nsh/defconfig +++ b/configs/lpc4337-ws/nsh/defconfig @@ -427,7 +427,6 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_TRACE is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/lpc4370-link2/nsh/defconfig b/configs/lpc4370-link2/nsh/defconfig index 06c83a82036..e587a2f26a8 100644 --- a/configs/lpc4370-link2/nsh/defconfig +++ b/configs/lpc4370-link2/nsh/defconfig @@ -429,7 +429,6 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_TRACE is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig index e0bdfe99667..4a49133fbb5 100644 --- a/configs/lpcxpresso-lpc1768/nsh/defconfig +++ b/configs/lpcxpresso-lpc1768/nsh/defconfig @@ -429,7 +429,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig index 076cab2ba8f..044236db935 100644 --- a/configs/lpcxpresso-lpc1768/nx/defconfig +++ b/configs/lpcxpresso-lpc1768/nx/defconfig @@ -402,7 +402,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set CONFIG_SPI_CMDDATA=y # CONFIG_SPI_CALLBACK is not set diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig index 9ccb5b0ff62..bbfe80e1b5b 100644 --- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig +++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig @@ -408,7 +408,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig index d5609ba8c46..f9a4688ce74 100644 --- a/configs/maple/nx/defconfig +++ b/configs/maple/nx/defconfig @@ -433,7 +433,6 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_TRACE is not set # CONFIG_I2C_RESET is not set CONFIG_SPI=y -CONFIG_SPI_OWNBUS=y CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_BITBANG is not set diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig index ac21bc58ff1..f17fcb5f167 100644 --- a/configs/mbed/nsh/defconfig +++ b/configs/mbed/nsh/defconfig @@ -397,7 +397,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_BITBANG is not set diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig index 46099115b59..e96169752e4 100644 --- a/configs/mcu123-lpc214x/composite/defconfig +++ b/configs/mcu123-lpc214x/composite/defconfig @@ -347,7 +347,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set CONFIG_SPI_CALLBACK=y diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig index 8ef7a8b8548..b5b987cdc0a 100644 --- a/configs/mcu123-lpc214x/nsh/defconfig +++ b/configs/mcu123-lpc214x/nsh/defconfig @@ -346,7 +346,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set CONFIG_SPI_CALLBACK=y diff --git a/configs/mcu123-lpc214x/src/lpc2148_spi1.c b/configs/mcu123-lpc214x/src/lpc2148_spi1.c index 7680dfce927..ef50d9577ee 100644 --- a/configs/mcu123-lpc214x/src/lpc2148_spi1.c +++ b/configs/mcu123-lpc214x/src/lpc2148_spi1.c @@ -119,9 +119,7 @@ * Private Function Prototypes ****************************************************************************/ -#ifndef CONFIG_SPI_OWNBUS static int spi_lock(FAR struct spi_dev_s *dev, bool lock); -#endif static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency); static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); @@ -138,9 +136,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw static const struct spi_ops_s g_spiops = { -#ifndef CONFIG_SPI_OWNBUS .lock = spi_lock, -#endif .select = spi_select, .setfrequency = spi_setfrequency, .status = spi_status, @@ -184,14 +180,12 @@ static struct spi_dev_s g_spidev = { &g_spiops }; * ****************************************************************************/ -#ifndef CONFIG_SPI_OWNBUS static int spi_lock(FAR struct spi_dev_s *dev, bool lock) { /* Not implemented */ return -ENOSYS; } -#endif /**************************************************************************** * Name: spi_select diff --git a/configs/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig index 11b7b9f702e..4fb67ed3fed 100644 --- a/configs/mcu123-lpc214x/usbmsc/defconfig +++ b/configs/mcu123-lpc214x/usbmsc/defconfig @@ -347,7 +347,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig index 6027a573e78..36d6cc69c66 100644 --- a/configs/mikroe-stm32f4/fulldemo/defconfig +++ b/configs/mikroe-stm32f4/fulldemo/defconfig @@ -670,7 +670,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set CONFIG_SPI_CALLBACK=y diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig index 91729241279..4c7630d34fd 100644 --- a/configs/mikroe-stm32f4/kostest/defconfig +++ b/configs/mikroe-stm32f4/kostest/defconfig @@ -674,7 +674,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig index 96807612490..c93f4503ae4 100644 --- a/configs/mikroe-stm32f4/nsh/defconfig +++ b/configs/mikroe-stm32f4/nsh/defconfig @@ -647,7 +647,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig index 5f362c19184..e36f145515a 100644 --- a/configs/mikroe-stm32f4/usbnsh/defconfig +++ b/configs/mikroe-stm32f4/usbnsh/defconfig @@ -654,7 +654,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/mirtoo/README.txt b/configs/mirtoo/README.txt index b93cdc0af19..a032c9140a7 100644 --- a/configs/mirtoo/README.txt +++ b/configs/mirtoo/README.txt @@ -574,7 +574,6 @@ Analog Input CONFIG_ADC=y : Enable support for analog input devices CONFIG_PIC32MX_ADC=y : Enable support the PIC32 ADC driver - CONFIG_SPI_OWNBUS=n : The PGA117 is *not* the only device on the bus CONFIG_ADC_PGA11X=y : Enable support for the PGA117 When CONFIG_PIC32MX_ADC=y is defined, the Mirtoo boot up logic will @@ -892,7 +891,6 @@ Where is one of the following: but can be enabled by setting: CONFIG_ADC=y : Enable support for analog input devices - CONFIG_SPI_OWNBUS=y : If the PGA117 is the only device on the bus CONFIG_ADC_PGA11X=y : Enable support for the PGA117 nxffs @@ -992,5 +990,4 @@ Where is one of the following: configuration but can be enabled by setting: CONFIG_ADC=y : Enable support for anlog input devices - CONFIG_SPI_OWNBUS=n : The PGA117 is *not* the only device on the bus CONFIG_ADC_PGA11X=y : Enable support for the PGA117 diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig index 45fa7f7b42e..19904aee9b0 100644 --- a/configs/mirtoo/nxffs/defconfig +++ b/configs/mirtoo/nxffs/defconfig @@ -447,7 +447,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/mirtoo/src/pic32_adc.c b/configs/mirtoo/src/pic32_adc.c index da7aae2d6d4..142dc2e0c59 100644 --- a/configs/mirtoo/src/pic32_adc.c +++ b/configs/mirtoo/src/pic32_adc.c @@ -66,7 +66,6 @@ * * CONFIG_ADC=y : Enable support for analog input devices * CONFIG_PIC32MX_ADC=y : Enable support the PIC32 ADC driver - * CONFIG_SPI_OWNBUS=n : The PGA117 is *not* the only device on the bus * CONFIG_ADC_PGA11X=y : Enable support for the PGA117 * * When CONFIG_PIC32MX_ADC=y is defined, the Mirtoo boot up logic will automatically diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig index 67b6d379491..89967193ffc 100644 --- a/configs/mx1ads/ostest/defconfig +++ b/configs/mx1ads/ostest/defconfig @@ -298,7 +298,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_BITBANG is not set diff --git a/configs/nucleo-f303re/nxlines/defconfig b/configs/nucleo-f303re/nxlines/defconfig index 8e3cb88b595..c5ff0305541 100644 --- a/configs/nucleo-f303re/nxlines/defconfig +++ b/configs/nucleo-f303re/nxlines/defconfig @@ -614,7 +614,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y CONFIG_SPI_CMDDATA=y # CONFIG_SPI_CALLBACK is not set diff --git a/configs/nucleo-f4x1re/f401-nsh/defconfig b/configs/nucleo-f4x1re/f401-nsh/defconfig index f82cd22de5f..87f801e4b14 100644 --- a/configs/nucleo-f4x1re/f401-nsh/defconfig +++ b/configs/nucleo-f4x1re/f401-nsh/defconfig @@ -530,7 +530,6 @@ CONFIG_DEV_NULL=y CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_BITBANG is not set diff --git a/configs/nucleo-f4x1re/f411-nsh/defconfig b/configs/nucleo-f4x1re/f411-nsh/defconfig index 0d4357f67ad..d0f3366ffd0 100755 --- a/configs/nucleo-f4x1re/f411-nsh/defconfig +++ b/configs/nucleo-f4x1re/f411-nsh/defconfig @@ -522,7 +522,6 @@ CONFIG_DEV_NULL=y CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_BITBANG is not set diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig index 82579a33e3c..5f8a38c0061 100644 --- a/configs/nucleus2g/nsh/defconfig +++ b/configs/nucleus2g/nsh/defconfig @@ -415,7 +415,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/nucleus2g/usbmsc/defconfig b/configs/nucleus2g/usbmsc/defconfig index d563c96dfc4..d083300ea30 100644 --- a/configs/nucleus2g/usbmsc/defconfig +++ b/configs/nucleus2g/usbmsc/defconfig @@ -397,7 +397,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig index a21eb0f3941..ab5e04d7a9e 100644 --- a/configs/olimex-lpc1766stk/ftpc/defconfig +++ b/configs/olimex-lpc1766stk/ftpc/defconfig @@ -420,7 +420,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set CONFIG_SPI_CALLBACK=y diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig index c8e172d0005..fbbb5832197 100644 --- a/configs/olimex-lpc1766stk/nsh/defconfig +++ b/configs/olimex-lpc1766stk/nsh/defconfig @@ -430,7 +430,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig index 04ee0c69264..b42ec425783 100644 --- a/configs/olimex-lpc1766stk/usbmsc/defconfig +++ b/configs/olimex-lpc1766stk/usbmsc/defconfig @@ -409,7 +409,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig index 7256bfc894e..880ad4564a3 100644 --- a/configs/olimex-lpc1766stk/zmodem/defconfig +++ b/configs/olimex-lpc1766stk/zmodem/defconfig @@ -431,7 +431,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/olimex-stm32-h407/nsh/defconfig b/configs/olimex-stm32-h407/nsh/defconfig index 1b2e103d251..85a285fce16 100644 --- a/configs/olimex-stm32-h407/nsh/defconfig +++ b/configs/olimex-stm32-h407/nsh/defconfig @@ -650,7 +650,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig index aac978afcfd..ef478aabb58 100644 --- a/configs/olimex-strp711/nettest/defconfig +++ b/configs/olimex-strp711/nettest/defconfig @@ -359,7 +359,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig index d460fbca16b..6e2ad2d0992 100644 --- a/configs/olimex-strp711/nsh/defconfig +++ b/configs/olimex-strp711/nsh/defconfig @@ -293,7 +293,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_BITBANG is not set diff --git a/configs/olimex-strp711/src/str71_spi.c b/configs/olimex-strp711/src/str71_spi.c index c73eff2e3a8..da9a9c2ca82 100644 --- a/configs/olimex-strp711/src/str71_spi.c +++ b/configs/olimex-strp711/src/str71_spi.c @@ -395,9 +395,7 @@ static inline void spi_drain(FAR struct str71x_spidev_s *priv); /* SPI methods */ -#ifndef CONFIG_SPI_OWNBUS static int spi_lock(FAR struct spi_dev_s *dev, bool lock); -#endif static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency); static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); @@ -414,9 +412,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t static const struct spi_ops_s g_spiops = { -#ifndef CONFIG_SPI_OWNBUS .lock = spi_lock, -#endif .select = spi_select, .setfrequency = spi_setfrequency, .status = spi_status, @@ -563,14 +559,12 @@ static inline void spi_drain(FAR struct str71x_spidev_s *priv) * ****************************************************************************/ -#ifndef CONFIG_SPI_OWNBUS static int spi_lock(FAR struct spi_dev_s *dev, bool lock) { /* Not implemented */ return -ENOSYS; } -#endif /**************************************************************************** * Name: spi_select diff --git a/configs/olimexino-stm32/can/defconfig b/configs/olimexino-stm32/can/defconfig index 3c1b3c9572a..2d1f797187e 100644 --- a/configs/olimexino-stm32/can/defconfig +++ b/configs/olimexino-stm32/can/defconfig @@ -675,7 +675,6 @@ CONFIG_I2C_TRANSFER=y CONFIG_I2C_RESET=y CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig index 790a9d7eda9..d40d6e629e6 100644 --- a/configs/olimexino-stm32/composite/defconfig +++ b/configs/olimexino-stm32/composite/defconfig @@ -595,7 +595,6 @@ CONFIG_DEV_NULL=y CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/olimexino-stm32/nsh/defconfig b/configs/olimexino-stm32/nsh/defconfig index f85604b2bff..d937053bcaf 100644 --- a/configs/olimexino-stm32/nsh/defconfig +++ b/configs/olimexino-stm32/nsh/defconfig @@ -587,7 +587,6 @@ CONFIG_DEV_NULL=y CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/olimexino-stm32/smallnsh/defconfig b/configs/olimexino-stm32/smallnsh/defconfig index 090a54bd542..f7c0187c472 100644 --- a/configs/olimexino-stm32/smallnsh/defconfig +++ b/configs/olimexino-stm32/smallnsh/defconfig @@ -654,7 +654,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/olimexino-stm32/tiny/defconfig b/configs/olimexino-stm32/tiny/defconfig index efd14968cfa..6ea19b78c2d 100644 --- a/configs/olimexino-stm32/tiny/defconfig +++ b/configs/olimexino-stm32/tiny/defconfig @@ -658,7 +658,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig index e43569435dc..b393389ee11 100644 --- a/configs/pic32mx7mmb/nsh/defconfig +++ b/configs/pic32mx7mmb/nsh/defconfig @@ -479,7 +479,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig index 6c11b6422a1..d1bb26f8a3e 100644 --- a/configs/pirelli_dpl10/nsh_highram/defconfig +++ b/configs/pirelli_dpl10/nsh_highram/defconfig @@ -340,7 +340,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -CONFIG_SPI_OWNBUS=y CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/sam3u-ek/README.txt b/configs/sam3u-ek/README.txt index 8c83af02539..7c85760c854 100644 --- a/configs/sam3u-ek/README.txt +++ b/configs/sam3u-ek/README.txt @@ -594,7 +594,6 @@ Configurations Device Drivers CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device CONFIG_INPUT=y : Enable support for input devices CONFIG_INPUT_ADS7843E=y : Enable support for the XPT2046 diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig index 91e38d7cedc..fbfe79de355 100644 --- a/configs/sam3u-ek/nxwm/defconfig +++ b/configs/sam3u-ek/nxwm/defconfig @@ -359,7 +359,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -CONFIG_SPI_OWNBUS=y CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_BITBANG is not set diff --git a/configs/sam4e-ek/README.txt b/configs/sam4e-ek/README.txt index d26fd802696..246a3bbdeac 100644 --- a/configs/sam4e-ek/README.txt +++ b/configs/sam4e-ek/README.txt @@ -913,7 +913,6 @@ Touchscreen Device Drivers CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device CONFIG_INPUT=y : Enable support for input devices CONFIG_INPUT_ADS7843E=y : Enable support for the ADS7843E @@ -1410,7 +1409,6 @@ Configurations Device Drivers CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device CONFIG_INPUT=y : Enable support for input devices CONFIG_INPUT_ADS7843E=y : Enable support for the ADS7843E diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig index 20301e172f7..356a2b01f6c 100644 --- a/configs/sam4e-ek/nsh/defconfig +++ b/configs/sam4e-ek/nsh/defconfig @@ -495,7 +495,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/sam4e-ek/nxwm/defconfig b/configs/sam4e-ek/nxwm/defconfig index 3571b872b7f..2a536a55c73 100644 --- a/configs/sam4e-ek/nxwm/defconfig +++ b/configs/sam4e-ek/nxwm/defconfig @@ -505,7 +505,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -CONFIG_SPI_OWNBUS=y CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig index 52f8843a1c7..82bcf2c5e6d 100644 --- a/configs/sam4e-ek/usbnsh/defconfig +++ b/configs/sam4e-ek/usbnsh/defconfig @@ -496,7 +496,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/sam4l-xplained/README.txt b/configs/sam4l-xplained/README.txt index 4d7b457914f..167ced24627 100644 --- a/configs/sam4l-xplained/README.txt +++ b/configs/sam4l-xplained/README.txt @@ -726,7 +726,6 @@ Configuration sub-directories Device Drivers CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device CONFIG_MMCSD=y : Enable MMC/SD support CONFIG_MMCSD_NSLOTS=1 : Only one MMC/SD card slot @@ -781,7 +780,6 @@ Configuration sub-directories CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported CONFIG_SPI_CMDDATA=y : CMD/DATA support is required - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device Device Drivers -> LCDs CONFIG_LCD=y : Enable LCD support diff --git a/configs/sam4l-xplained/src/sam_spi.c b/configs/sam4l-xplained/src/sam_spi.c index 436d231e14a..c461c325bfe 100644 --- a/configs/sam4l-xplained/src/sam_spi.c +++ b/configs/sam4l-xplained/src/sam_spi.c @@ -54,13 +54,6 @@ /************************************************************************************ * Pre-processor Definitions ************************************************************************************/ -/* Configuration ********************************************************************/ - -#if defined(CONFIG_SAM4L_XPLAINED_IOMODULE) && \ - defined(CONFIG_SAM4L_XPLAINED_OLED1MODULE) && defined(CONFIG_SPI_OWNBUS) -# error CONFIG_SPI_OWNBUS must not defined if using both I/O1 and OLED1 modules -#endif - /* Enables debug output from this file (needs CONFIG_DEBUG too) */ #undef SPI_DEBUG /* Define to enable debug */ diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig index 4d1ed9660fc..250aef7dcd8 100644 --- a/configs/sama5d3x-ek/demo/defconfig +++ b/configs/sama5d3x-ek/demo/defconfig @@ -548,7 +548,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig index ae56b875ee2..87d0f1b9a61 100644 --- a/configs/sama5d4-ek/at25boot/defconfig +++ b/configs/sama5d4-ek/at25boot/defconfig @@ -502,7 +502,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/samd20-xplained/README.txt b/configs/samd20-xplained/README.txt index 00ac9b04974..f489d6b6187 100644 --- a/configs/samd20-xplained/README.txt +++ b/configs/samd20-xplained/README.txt @@ -768,7 +768,6 @@ Configuration sub-directories Device Drivers CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device CONFIG_MMCSD=y : Enable MMC/SD support CONFIG_MMCSD_NSLOTS=1 : Only one MMC/SD card slot @@ -830,7 +829,6 @@ Configuration sub-directories CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported CONFIG_SPI_CMDDATA=y : CMD/DATA support is required - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device Device Drivers -> LCDs CONFIG_LCD=y : Enable LCD support diff --git a/configs/samd20-xplained/src/sam_spi.c b/configs/samd20-xplained/src/sam_spi.c index 04e3e731eae..dc358b6896f 100644 --- a/configs/samd20-xplained/src/sam_spi.c +++ b/configs/samd20-xplained/src/sam_spi.c @@ -56,12 +56,6 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ -/* Configuration ************************************************************/ - -#if defined(CONFIG_SAMD20_XPLAINED_IOMODULE) && \ - defined(CONFIG_SAMD20_XPLAINED_OLED1MODULE) && defined(CONFIG_SPI_OWNBUS) -# error CONFIG_SPI_OWNBUS must not defined if using both I/O1 and OLED1 modules -#endif /* Enables debug output from this file (needs CONFIG_DEBUG too) */ diff --git a/configs/samd21-xplained/README.txt b/configs/samd21-xplained/README.txt index 707e8aa5065..c000821cb35 100644 --- a/configs/samd21-xplained/README.txt +++ b/configs/samd21-xplained/README.txt @@ -630,7 +630,6 @@ Configuration sub-directories Device Drivers CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device CONFIG_MMCSD=y : Enable MMC/SD support CONFIG_MMCSD_NSLOTS=1 : Only one MMC/SD card slot @@ -692,7 +691,6 @@ Configuration sub-directories CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported CONFIG_SPI_CMDDATA=y : CMD/DATA support is required - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device Device Drivers -> LCDs CONFIG_LCD=y : Enable LCD support diff --git a/configs/samd21-xplained/src/sam_spi.c b/configs/samd21-xplained/src/sam_spi.c index 19b4f0f3c08..0eb4ea4b2eb 100644 --- a/configs/samd21-xplained/src/sam_spi.c +++ b/configs/samd21-xplained/src/sam_spi.c @@ -56,12 +56,6 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ -/* Configuration ************************************************************/ - -#if defined(CONFIG_SAMD21_XPLAINED_IOMODULE) && \ - defined(CONFIG_SAMD21_XPLAINED_OLED1MODULE) && defined(CONFIG_SPI_OWNBUS) -# error CONFIG_SPI_OWNBUS must not defined if using both I/O1 and OLED1 modules -#endif /* Enables debug output from this file (needs CONFIG_DEBUG too) */ diff --git a/configs/same70-xplained/netnsh/defconfig b/configs/same70-xplained/netnsh/defconfig index 5886fdac8b7..630a9bd3d0a 100644 --- a/configs/same70-xplained/netnsh/defconfig +++ b/configs/same70-xplained/netnsh/defconfig @@ -510,7 +510,6 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_TRACE is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/same70-xplained/nsh/defconfig b/configs/same70-xplained/nsh/defconfig index 1a4aa8a64eb..b763572bf02 100644 --- a/configs/same70-xplained/nsh/defconfig +++ b/configs/same70-xplained/nsh/defconfig @@ -499,7 +499,6 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_TRACE is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/saml21-xplained/README.txt b/configs/saml21-xplained/README.txt index 1d0e24b7e7c..673b9e43b22 100644 --- a/configs/saml21-xplained/README.txt +++ b/configs/saml21-xplained/README.txt @@ -800,7 +800,6 @@ Configuration sub-directories Device Drivers CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device CONFIG_MMCSD=y : Enable MMC/SD support CONFIG_MMCSD_NSLOTS=1 : Only one MMC/SD card slot @@ -865,7 +864,6 @@ Configuration sub-directories CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported CONFIG_SPI_CMDDATA=y : CMD/DATA support is required - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device Device Drivers -> LCDs CONFIG_LCD=y : Enable LCD support diff --git a/configs/saml21-xplained/src/sam_spi.c b/configs/saml21-xplained/src/sam_spi.c index 1f2832c4154..01821792709 100644 --- a/configs/saml21-xplained/src/sam_spi.c +++ b/configs/saml21-xplained/src/sam_spi.c @@ -56,12 +56,6 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ -/* Configuration ************************************************************/ - -#if defined(CONFIG_SAML21_XPLAINED_IOMODULE) && \ - defined(CONFIG_SAML21_XPLAINED_OLED1MODULE) && defined(CONFIG_SPI_OWNBUS) -# error CONFIG_SPI_OWNBUS must not defined if using both I/O1 and OLED1 modules -#endif /* Enables debug output from this file (needs CONFIG_DEBUG too) */ diff --git a/configs/samv71-xult/knsh/defconfig b/configs/samv71-xult/knsh/defconfig index 1dae56510f6..6aae2ccdca1 100644 --- a/configs/samv71-xult/knsh/defconfig +++ b/configs/samv71-xult/knsh/defconfig @@ -509,7 +509,6 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_TRACE is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/samv71-xult/mxtxplnd/defconfig b/configs/samv71-xult/mxtxplnd/defconfig index 8eeb58dab18..e58e81681d6 100644 --- a/configs/samv71-xult/mxtxplnd/defconfig +++ b/configs/samv71-xult/mxtxplnd/defconfig @@ -500,7 +500,6 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_TRACE is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/samv71-xult/netnsh/defconfig b/configs/samv71-xult/netnsh/defconfig index e849d5cd48e..6c3e92ba506 100644 --- a/configs/samv71-xult/netnsh/defconfig +++ b/configs/samv71-xult/netnsh/defconfig @@ -524,7 +524,6 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_TRACE is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/samv71-xult/nsh/defconfig b/configs/samv71-xult/nsh/defconfig index 47d62512614..c935efe9c53 100644 --- a/configs/samv71-xult/nsh/defconfig +++ b/configs/samv71-xult/nsh/defconfig @@ -505,7 +505,6 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_TRACE is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/samv71-xult/nxwm/defconfig b/configs/samv71-xult/nxwm/defconfig index 80daca1d43d..254391b7543 100644 --- a/configs/samv71-xult/nxwm/defconfig +++ b/configs/samv71-xult/nxwm/defconfig @@ -503,7 +503,6 @@ CONFIG_I2C_TRANSFER=y # CONFIG_I2C_TRACE is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig index 450b5b925f5..9ed154b6e3c 100644 --- a/configs/shenzhou/nsh/defconfig +++ b/configs/shenzhou/nsh/defconfig @@ -653,7 +653,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig index d4cb913f764..a59bbbe7481 100644 --- a/configs/shenzhou/nxwm/defconfig +++ b/configs/shenzhou/nxwm/defconfig @@ -680,7 +680,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/shenzhou/src/stm32_mmcsd.c b/configs/shenzhou/src/stm32_mmcsd.c index 043951e7fb4..983ef01bb9e 100644 --- a/configs/shenzhou/src/stm32_mmcsd.c +++ b/configs/shenzhou/src/stm32_mmcsd.c @@ -58,10 +58,6 @@ #ifndef CONFIG_STM32_SPI1 # undef HAVE_MMCSD -#else -# ifdef CONFIG_SPI_OWNBUS -# warning "SPI1 is shared with SD and FLASH but CONFIG_SPI_OWNBUS is defined" -# endif #endif /* Can't support MMC/SD features if MMC/SD driver support is not selected */ diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig index a6b9cb1aca7..49f1bee7ebe 100644 --- a/configs/shenzhou/thttpd/defconfig +++ b/configs/shenzhou/thttpd/defconfig @@ -682,7 +682,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig index 90965930ba2..74261f55dd0 100644 --- a/configs/spark/composite/defconfig +++ b/configs/spark/composite/defconfig @@ -629,7 +629,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig index 5efbe272778..35b701ff8f2 100644 --- a/configs/spark/nsh/defconfig +++ b/configs/spark/nsh/defconfig @@ -629,7 +629,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig index a83051c5d2c..729dd857f05 100644 --- a/configs/spark/usbmsc/defconfig +++ b/configs/spark/usbmsc/defconfig @@ -629,7 +629,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/spark/usbnsh/defconfig b/configs/spark/usbnsh/defconfig index b6ec5e53dce..c30bbe563ee 100644 --- a/configs/spark/usbnsh/defconfig +++ b/configs/spark/usbnsh/defconfig @@ -625,7 +625,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig index c3279184e4b..31f1acc85ed 100644 --- a/configs/spark/usbserial/defconfig +++ b/configs/spark/usbserial/defconfig @@ -627,7 +627,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig index 3ed972506ed..599f2896147 100644 --- a/configs/stm32_tiny/nsh/defconfig +++ b/configs/stm32_tiny/nsh/defconfig @@ -371,7 +371,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_ARCH_HAVE_I2CRESET=y CONFIG_SPI=y -CONFIG_SPI_OWNBUS=y CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_RTC is not set diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig index be47524f79b..64cc8e82215 100644 --- a/configs/stm32f3discovery/usbnsh/defconfig +++ b/configs/stm32f3discovery/usbnsh/defconfig @@ -385,7 +385,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_ARCH_HAVE_I2CRESET=y CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_RTC is not set diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig index 4b4bd0e9b3f..89291cb92cb 100644 --- a/configs/stm32f429i-disco/extflash/defconfig +++ b/configs/stm32f429i-disco/extflash/defconfig @@ -668,7 +668,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/stm32f429i-disco/ltdc/defconfig b/configs/stm32f429i-disco/ltdc/defconfig index da6595ef70c..51b952e1726 100644 --- a/configs/stm32f429i-disco/ltdc/defconfig +++ b/configs/stm32f429i-disco/ltdc/defconfig @@ -623,7 +623,6 @@ CONFIG_DEV_NULL=y CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y CONFIG_SPI_CMDDATA=y # CONFIG_SPI_BITBANG is not set diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig index 8322226dcea..e0f549922de 100644 --- a/configs/stm32f429i-disco/nsh/defconfig +++ b/configs/stm32f429i-disco/nsh/defconfig @@ -594,7 +594,6 @@ CONFIG_DEV_NULL=y CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/stm32f429i-disco/src/stm32_ili93414ws.c b/configs/stm32f429i-disco/src/stm32_ili93414ws.c index 85c26f87a49..72a6245d3cf 100644 --- a/configs/stm32f429i-disco/src/stm32_ili93414ws.c +++ b/configs/stm32f429i-disco/src/stm32_ili93414ws.c @@ -116,16 +116,13 @@ #define ILI93414WS_SPI_SR (ILI93414WS_SPI_BASE + STM32_SPI_SR_OFFSET) #define ILI93414WS_SPI_DR (ILI93414WS_SPI_BASE + STM32_SPI_DR_OFFSET) -/* - * Activates the usage of the spi interface structure if several active devices +/* Activates the usage of the spi interface structure if several active devices * connected on the SPI5 bus, e.g. LCD Display, MEMS. This will perform locking * of the spi bus by SPI_LOCK at each selection of the SPI5 device. */ #ifdef CONFIG_STM32_SPI5 -# ifndef CONFIG_SPI_OWNBUS # define ILI93414WS_SPI -# endif #endif /* Debug option */ @@ -268,7 +265,6 @@ static inline void stm32_ili93414ws_modifycr1(uint16_t setbits, uint16_t clrbits stm32_ili93414ws_modifyreg(ILI93414WS_SPI_CR1, setbits, clrbits); } - /**************************************************************************** * Name: stm32_ili93414ws_modifycr2 * @@ -818,8 +814,7 @@ static void stm32_ili93414ws_spiconfig(FAR struct ili9341_lcd_s *lcd) stm32_ili93414ws_set8bitmode(priv); #ifdef ILI93414WS_SPI - /* - * Backup cr1 and cr2 register to be sure they will be usable + /* Backup cr1 and cr2 register to be sure they will be usable * by default spi interface. Disable spi device here is neccessary at the time * restoring the register during deselection. */ @@ -855,6 +850,7 @@ static void stm32_ili93414ws_spiconfig(FAR struct ili9341_lcd_s *lcd) * Returned Value: * ****************************************************************************/ + #ifdef ILI93414WS_SPI static inline void stm32_ili93414ws_cmddata( FAR struct ili9341_lcd_s *lcd, bool cmd) @@ -908,6 +904,7 @@ static int stm32_ili93414ws_backlight(FAR struct ili9341_lcd_s *lcd, int level) * Returned Value: * ****************************************************************************/ + #ifdef ILI93414WS_SPI static void stm32_ili93414ws_select(FAR struct ili9341_lcd_s *lcd) { diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig index 4962c7a6868..da459762bb5 100644 --- a/configs/stm32f429i-disco/usbmsc/defconfig +++ b/configs/stm32f429i-disco/usbmsc/defconfig @@ -573,7 +573,6 @@ CONFIG_DEV_NULL=y CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_BITBANG is not set diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig index 449e93f09a2..176240b55a3 100644 --- a/configs/stm32f429i-disco/usbnsh/defconfig +++ b/configs/stm32f429i-disco/usbnsh/defconfig @@ -564,7 +564,6 @@ CONFIG_RAMDISK=y CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_BITBANG is not set diff --git a/configs/stm32f4discovery/ipv6/defconfig b/configs/stm32f4discovery/ipv6/defconfig index 3ca78b11c44..3bd216d2644 100644 --- a/configs/stm32f4discovery/ipv6/defconfig +++ b/configs/stm32f4discovery/ipv6/defconfig @@ -694,7 +694,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig index c5b5bcab291..47e5282a81f 100644 --- a/configs/stm32f4discovery/netnsh/defconfig +++ b/configs/stm32f4discovery/netnsh/defconfig @@ -693,7 +693,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig index b6bf73b2e2e..00d2f5f697a 100644 --- a/configs/stm32f4discovery/nsh/defconfig +++ b/configs/stm32f4discovery/nsh/defconfig @@ -651,7 +651,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig index 91aced779ee..1660309aba9 100644 --- a/configs/stm32f4discovery/nxlines/defconfig +++ b/configs/stm32f4discovery/nxlines/defconfig @@ -652,7 +652,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig index f6872357378..bb7869bcd2b 100644 --- a/configs/stm32f4discovery/usbnsh/defconfig +++ b/configs/stm32f4discovery/usbnsh/defconfig @@ -658,7 +658,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/stm32f746g-disco/knsh/defconfig b/configs/stm32f746g-disco/knsh/defconfig index 54783fc5f25..de3d0f0734a 100644 --- a/configs/stm32f746g-disco/knsh/defconfig +++ b/configs/stm32f746g-disco/knsh/defconfig @@ -440,7 +440,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/stm32f746g-disco/netnsh/defconfig b/configs/stm32f746g-disco/netnsh/defconfig index 2c49adeb79e..3fb674d00e1 100644 --- a/configs/stm32f746g-disco/netnsh/defconfig +++ b/configs/stm32f746g-disco/netnsh/defconfig @@ -458,7 +458,6 @@ CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/stm32f746g-disco/nsh/defconfig b/configs/stm32f746g-disco/nsh/defconfig index f6d5dc71120..58e7ac1a3b1 100644 --- a/configs/stm32f746g-disco/nsh/defconfig +++ b/configs/stm32f746g-disco/nsh/defconfig @@ -428,7 +428,6 @@ CONFIG_DEV_NULL=y CONFIG_ARCH_HAVE_I2CRESET=y # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/teensy-2.0/usbmsc/defconfig b/configs/teensy-2.0/usbmsc/defconfig index 46851a8e997..8670fb387bb 100644 --- a/configs/teensy-2.0/usbmsc/defconfig +++ b/configs/teensy-2.0/usbmsc/defconfig @@ -291,7 +291,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set CONFIG_SPI_CALLBACK=y diff --git a/configs/teensy-3.x/nsh/defconfig b/configs/teensy-3.x/nsh/defconfig index 6b238cb2271..56c4cdbc27d 100644 --- a/configs/teensy-3.x/nsh/defconfig +++ b/configs/teensy-3.x/nsh/defconfig @@ -409,7 +409,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/teensy-lc/nsh/defconfig b/configs/teensy-lc/nsh/defconfig index c7e3a851351..a8ae48f1578 100644 --- a/configs/teensy-lc/nsh/defconfig +++ b/configs/teensy-lc/nsh/defconfig @@ -392,7 +392,6 @@ CONFIG_PWM=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/viewtool-stm32f107/README.txt b/configs/viewtool-stm32f107/README.txt index 2f86c14996e..509a4761702 100644 --- a/configs/viewtool-stm32f107/README.txt +++ b/configs/viewtool-stm32f107/README.txt @@ -740,7 +740,6 @@ Configurations Device Drivers CONFIG_SPI=y : Enable SPI support CONFIG_SPI_EXCHANGE=y : The exchange() method is supported - CONFIG_SPI_OWNBUS=y : Smaller code if this is the only SPI device CONFIG_INPUT=y : Enable support for input devices CONFIG_INPUT_ADS7843E=y : Enable support for the XPT2046 diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig index bc5ca482cb4..4374cf562cc 100644 --- a/configs/vsn/nsh/defconfig +++ b/configs/vsn/nsh/defconfig @@ -631,7 +631,6 @@ CONFIG_I2C_WRITEREAD=y # CONFIG_I2C_TRACE is not set # CONFIG_I2C_RESET is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set CONFIG_SPI_EXCHANGE=y # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig index 0152889454a..8cb4cf638af 100644 --- a/configs/zkit-arm-1769/nsh/defconfig +++ b/configs/zkit-arm-1769/nsh/defconfig @@ -430,7 +430,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set # CONFIG_SPI_CMDDATA is not set # CONFIG_SPI_CALLBACK is not set diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig index 0cafd0b8c6c..fe91000caca 100644 --- a/configs/zkit-arm-1769/nxhello/defconfig +++ b/configs/zkit-arm-1769/nxhello/defconfig @@ -430,7 +430,6 @@ CONFIG_DEV_NULL=y # CONFIG_I2C is not set CONFIG_SPI=y # CONFIG_SPI_SLAVE is not set -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set CONFIG_SPI_CMDDATA=y # CONFIG_SPI_CALLBACK is not set diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig index d1815e2b5d7..debd3cb7b55 100644 --- a/configs/zp214xpa/nxlines/defconfig +++ b/configs/zp214xpa/nxlines/defconfig @@ -337,7 +337,6 @@ CONFIG_DEV_NULL=y # CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set CONFIG_SPI=y -# CONFIG_SPI_OWNBUS is not set # CONFIG_SPI_EXCHANGE is not set CONFIG_SPI_CMDDATA=y # CONFIG_SPI_CALLBACK is not set diff --git a/configs/zp214xpa/src/lpc2148_spi1.c b/configs/zp214xpa/src/lpc2148_spi1.c index fc839a013a9..970cb93fec9 100644 --- a/configs/zp214xpa/src/lpc2148_spi1.c +++ b/configs/zp214xpa/src/lpc2148_spi1.c @@ -122,9 +122,7 @@ * Private Function Prototypes ****************************************************************************/ -#ifndef CONFIG_SPI_OWNBUS static int spi_lock(FAR struct spi_dev_s *dev, bool lock); -#endif static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency); static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); @@ -141,9 +139,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw static const struct spi_ops_s g_spiops = { -#ifndef CONFIG_SPI_OWNBUS .lock = spi_lock, -#endif .select = spi_select, .setfrequency = spi_setfrequency, .status = spi_status, @@ -187,14 +183,12 @@ static struct spi_dev_s g_spidev = { &g_spiops }; * ****************************************************************************/ -#ifndef CONFIG_SPI_OWNBUS static int spi_lock(FAR struct spi_dev_s *dev, bool lock) { /* Not implemented -- the UG_2864AMBAG01 is the only device on SPI1 */ return -ENOSYS; } -#endif /**************************************************************************** * Name: spi_select