diff options
Diffstat (limited to 'nuttx/drivers')
26 files changed, 66 insertions, 49 deletions
diff --git a/nuttx/drivers/Kconfig b/nuttx/drivers/Kconfig index efcf9bc55..16a9e2d32 100644 --- a/nuttx/drivers/Kconfig +++ b/nuttx/drivers/Kconfig @@ -150,33 +150,10 @@ menuconfig SPI ---help--- This selection enables selection of common SPI options. This option should be enabled by all platforms that support SPI interfaces. - See include/nuttx/spi.h for further SPI driver information. + See include/nuttx/spi/spi.h for further SPI driver information. if SPI -config SPI_OWNBUS - bool "SPI single device" - default n - ---help--- - Set if there is only one active device on the SPI bus. No locking or - SPI configuration will be performed. It is not necessary for clients to - lock, re-configure, etc.. - -config SPI_EXCHANGE - bool "SPI exchange" - default y - ---help--- - Driver supports a single exchange method (vs a recvblock() and - sndblock() methods). - -config SPI_CMDDATA - bool "SPI CMD/DATA" - default n - ---help--- - Devices on the SPI bus require out-of-band support to distinguish - command transfers from data transfers. Such devices will often support - either 9-bit SPI (yech) or 8-bit SPI and a GPIO output that selects - between command and data. - +source drivers/spi/Kconfig endif menuconfig RTC diff --git a/nuttx/drivers/analog/ad5410.c b/nuttx/drivers/analog/ad5410.c index 3e925a3a9..0c7746e19 100644 --- a/nuttx/drivers/analog/ad5410.c +++ b/nuttx/drivers/analog/ad5410.c @@ -51,7 +51,7 @@ #include <arch/board/board.h> #include <nuttx/arch.h> #include <nuttx/analog/dac.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #if defined(CONFIG_DAC_AD5410) diff --git a/nuttx/drivers/analog/ads1255.c b/nuttx/drivers/analog/ads1255.c index 374decc54..525e3cb7f 100644 --- a/nuttx/drivers/analog/ads1255.c +++ b/nuttx/drivers/analog/ads1255.c @@ -51,7 +51,7 @@ #include <arch/board/board.h> #include <nuttx/arch.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/analog/adc.h> #if defined(CONFIG_ADC_ADS1255) diff --git a/nuttx/drivers/input/ads7843e.c b/nuttx/drivers/input/ads7843e.c index 567e332b6..b8f4f16e6 100644 --- a/nuttx/drivers/input/ads7843e.c +++ b/nuttx/drivers/input/ads7843e.c @@ -67,7 +67,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/arch.h> #include <nuttx/fs/fs.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/wqueue.h> #include <nuttx/input/touchscreen.h> diff --git a/nuttx/drivers/input/ads7843e.h b/nuttx/drivers/input/ads7843e.h index bb3db5630..5fe38d34c 100644 --- a/nuttx/drivers/input/ads7843e.h +++ b/nuttx/drivers/input/ads7843e.h @@ -58,7 +58,7 @@ #include <wdog.h> #include <nuttx/wqueue.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/clock.h> #include <nuttx/input/ads7843e.h> diff --git a/nuttx/drivers/input/max11802.c b/nuttx/drivers/input/max11802.c index 9cb8dee0e..493a2a99b 100644 --- a/nuttx/drivers/input/max11802.c +++ b/nuttx/drivers/input/max11802.c @@ -61,7 +61,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/arch.h> #include <nuttx/fs/fs.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/wqueue.h> #include <nuttx/input/touchscreen.h> diff --git a/nuttx/drivers/input/max11802.h b/nuttx/drivers/input/max11802.h index b6beec045..075631799 100644 --- a/nuttx/drivers/input/max11802.h +++ b/nuttx/drivers/input/max11802.h @@ -53,7 +53,7 @@ #include <wdog.h> #include <nuttx/wqueue.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/clock.h> #include <nuttx/input/max11802.h> diff --git a/nuttx/drivers/lcd/mio283qt2.c b/nuttx/drivers/lcd/mio283qt2.c index 3a1087c20..4f737eb7f 100644 --- a/nuttx/drivers/lcd/mio283qt2.c +++ b/nuttx/drivers/lcd/mio283qt2.c @@ -57,7 +57,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/lcd/lcd.h> #include <nuttx/lcd/mio283qt2.h> diff --git a/nuttx/drivers/lcd/nokia6100.c b/nuttx/drivers/lcd/nokia6100.c index 7354b8a91..402cf8438 100644 --- a/nuttx/drivers/lcd/nokia6100.c +++ b/nuttx/drivers/lcd/nokia6100.c @@ -54,7 +54,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/lcd/lcd.h> #include <nuttx/lcd/nokia6100.h> diff --git a/nuttx/drivers/lcd/p14201.c b/nuttx/drivers/lcd/p14201.c index c45292fed..6c74a6f7c 100644 --- a/nuttx/drivers/lcd/p14201.c +++ b/nuttx/drivers/lcd/p14201.c @@ -48,7 +48,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/lcd/lcd.h> #include <nuttx/lcd/p14201.h> diff --git a/nuttx/drivers/lcd/skeleton.c b/nuttx/drivers/lcd/skeleton.c index 83aa92018..44a45f26b 100644 --- a/nuttx/drivers/lcd/skeleton.c +++ b/nuttx/drivers/lcd/skeleton.c @@ -47,7 +47,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/lcd/lcd.h> #include "up_arch.h" diff --git a/nuttx/drivers/lcd/ssd1289.c b/nuttx/drivers/lcd/ssd1289.c index ef0ede25a..75abdb1ac 100644 --- a/nuttx/drivers/lcd/ssd1289.c +++ b/nuttx/drivers/lcd/ssd1289.c @@ -53,7 +53,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/lcd/lcd.h> #include <nuttx/lcd/ssd1289.h> diff --git a/nuttx/drivers/lcd/ssd1306.c b/nuttx/drivers/lcd/ssd1306.c index 3fa7a34f6..d92075610 100644 --- a/nuttx/drivers/lcd/ssd1306.c +++ b/nuttx/drivers/lcd/ssd1306.c @@ -129,7 +129,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/lcd/lcd.h> #include <nuttx/lcd/ssd1306.h> diff --git a/nuttx/drivers/lcd/st7567.c b/nuttx/drivers/lcd/st7567.c index ffc845da1..f08897710 100644 --- a/nuttx/drivers/lcd/st7567.c +++ b/nuttx/drivers/lcd/st7567.c @@ -58,7 +58,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/lcd/lcd.h> #include <nuttx/lcd/st7567.h> diff --git a/nuttx/drivers/lcd/ug-2864ambag01.c b/nuttx/drivers/lcd/ug-2864ambag01.c index 993303b93..4879c027f 100644 --- a/nuttx/drivers/lcd/ug-2864ambag01.c +++ b/nuttx/drivers/lcd/ug-2864ambag01.c @@ -127,7 +127,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/lcd/lcd.h> #include <nuttx/lcd/ug-2864ambag01.h> diff --git a/nuttx/drivers/lcd/ug-9664hswag01.c b/nuttx/drivers/lcd/ug-9664hswag01.c index 1d1e9194f..1ad2e1150 100644 --- a/nuttx/drivers/lcd/ug-9664hswag01.c +++ b/nuttx/drivers/lcd/ug-9664hswag01.c @@ -52,7 +52,7 @@ #include <debug.h> #include <nuttx/arch.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/lcd/lcd.h> #include <nuttx/lcd/ug-9664hswag01.h> diff --git a/nuttx/drivers/mmcsd/mmcsd_spi.c b/nuttx/drivers/mmcsd/mmcsd_spi.c index be4ebdcdc..ee9935f7e 100644 --- a/nuttx/drivers/mmcsd/mmcsd_spi.c +++ b/nuttx/drivers/mmcsd/mmcsd_spi.c @@ -53,7 +53,7 @@ #include <nuttx/arch.h> #include <nuttx/clock.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/fs/fs.h> #include <nuttx/mmcsd.h> diff --git a/nuttx/drivers/mtd/at25.c b/nuttx/drivers/mtd/at25.c index 6c4e183eb..465ea4425 100644 --- a/nuttx/drivers/mtd/at25.c +++ b/nuttx/drivers/mtd/at25.c @@ -51,7 +51,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/fs/ioctl.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/mtd.h> /************************************************************************************ diff --git a/nuttx/drivers/mtd/at45db.c b/nuttx/drivers/mtd/at45db.c index fbdc9090a..9b9f9ead7 100644 --- a/nuttx/drivers/mtd/at45db.c +++ b/nuttx/drivers/mtd/at45db.c @@ -62,7 +62,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/arch.h> #include <nuttx/fs/ioctl.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/mtd.h> /************************************************************************************ diff --git a/nuttx/drivers/mtd/m25px.c b/nuttx/drivers/mtd/m25px.c index d799ee0cb..02aad5e7c 100644 --- a/nuttx/drivers/mtd/m25px.c +++ b/nuttx/drivers/mtd/m25px.c @@ -51,7 +51,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/fs/ioctl.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/mtd.h> /************************************************************************************ diff --git a/nuttx/drivers/mtd/ramtron.c b/nuttx/drivers/mtd/ramtron.c index 44bc46c2e..d2180c91a 100644 --- a/nuttx/drivers/mtd/ramtron.c +++ b/nuttx/drivers/mtd/ramtron.c @@ -68,7 +68,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/fs/ioctl.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/mtd.h> /************************************************************************************ diff --git a/nuttx/drivers/mtd/sst25.c b/nuttx/drivers/mtd/sst25.c index 0f58c4ae2..fc4e5b36d 100644 --- a/nuttx/drivers/mtd/sst25.c +++ b/nuttx/drivers/mtd/sst25.c @@ -53,7 +53,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/fs/ioctl.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/mtd.h> /************************************************************************************ diff --git a/nuttx/drivers/mtd/w25.c b/nuttx/drivers/mtd/w25.c index 065e04528..861e19ab5 100644 --- a/nuttx/drivers/mtd/w25.c +++ b/nuttx/drivers/mtd/w25.c @@ -53,7 +53,7 @@ #include <nuttx/kmalloc.h> #include <nuttx/fs/ioctl.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/mtd.h> /************************************************************************************ diff --git a/nuttx/drivers/net/enc28j60.c b/nuttx/drivers/net/enc28j60.c index b6e265bc2..9ebdb06ed 100644 --- a/nuttx/drivers/net/enc28j60.c +++ b/nuttx/drivers/net/enc28j60.c @@ -56,7 +56,7 @@ #include <nuttx/irq.h> #include <nuttx/arch.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/wqueue.h> #include <nuttx/clock.h> #include <nuttx/net/enc28j60.h> diff --git a/nuttx/drivers/spi/Kconfig b/nuttx/drivers/spi/Kconfig new file mode 100644 index 000000000..645f4017b --- /dev/null +++ b/nuttx/drivers/spi/Kconfig @@ -0,0 +1,40 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +config SPI + bool "SPI Driver Support" + default n + ---help--- + This selection enables selection of common SPI options. This option + should be enabled by all platforms that support SPI interfaces. + See include/nuttx/spi/spi.h for further SPI driver information. + +if SPI +config SPI_OWNBUS + bool "SPI single device" + default n + ---help--- + Set if there is only one active device on the SPI bus. No locking or + SPI configuration will be performed. It is not necessary for clients to + lock, re-configure, etc.. + +config SPI_EXCHANGE + bool "SPI exchange" + default y + ---help--- + Driver supports a single exchange method (vs a recvblock() and + sndblock() methods). + +config SPI_CMDDATA + bool "SPI CMD/DATA" + default n + ---help--- + Devices on the SPI bus require out-of-band support to distinguish + command transfers from data transfers. Such devices will often support + either 9-bit SPI (yech) or 8-bit SPI and a GPIO output that selects + between command and data. + +endif + diff --git a/nuttx/drivers/wireless/nrf24l01.h b/nuttx/drivers/wireless/nrf24l01.h index c5bddf0b8..caaf67f56 100644 --- a/nuttx/drivers/wireless/nrf24l01.h +++ b/nuttx/drivers/wireless/nrf24l01.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <nuttx/spi.h> +#include <nuttx/spi/spi.h> #include <nuttx/irq.h> #include <nuttx/wireless/wireless.h> |