From f6e49caba89ffc2033e152c8164a5a49cf154a2f Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 23 Jan 2016 16:18:13 -0600 Subject: [PATCH] All SPI-based device drivers needs to call SPI_HWFEATURES() with zero in order to co-exist with drivers that use H/W features --- configs | 2 +- drivers/analog/ads1255.c | 1 + drivers/analog/pga11x.c | 1 + drivers/audio/vs1053.c | 1 + drivers/eeprom/spi_xx25xx.c | 1 + drivers/input/ads7843e.c | 6 ++++-- drivers/input/max11802.c | 6 ++++-- drivers/lcd/memlcd.c | 10 ++++++---- drivers/lcd/nokia6100.c | 6 ++++-- drivers/lcd/p14201.c | 6 ++++-- drivers/lcd/ssd1306_base.c | 13 +++++++------ drivers/lcd/ssd1306_spi.c | 3 ++- drivers/lcd/ssd1351.c | 6 ++++-- drivers/lcd/st7567.c | 3 ++- drivers/lcd/ug-2864ambag01.c | 6 ++++-- drivers/lcd/ug-9664hswag01.c | 3 ++- drivers/mmcsd/mmcsd_spi.c | 6 ++++-- drivers/mtd/at25.c | 1 + drivers/mtd/at45db.c | 1 + drivers/mtd/m25px.c | 1 + drivers/mtd/ramtron.c | 1 + drivers/mtd/sst25.c | 1 + drivers/mtd/sst25xx.c | 1 + drivers/mtd/w25.c | 1 + drivers/net/enc28j60.c | 6 ++++-- drivers/net/encx24j600.c | 6 ++++-- drivers/sensors/adxl345_base.c | 3 ++- drivers/sensors/adxl345_spi.c | 3 ++- drivers/sensors/max31855.c | 3 ++- drivers/sensors/max6675.c | 3 ++- drivers/sensors/mpl115a.c | 3 ++- drivers/wireless/cc1101.c | 1 + drivers/wireless/cc3000/cc3000.c | 3 ++- drivers/wireless/nrf24l01.c | 6 ++++-- drivers/wireless/pn532.c | 6 ++++-- 35 files changed, 88 insertions(+), 42 deletions(-) diff --git a/configs b/configs index 06c7256f4ec..66325b8ab4f 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit 06c7256f4ece872da23f96e1e587e86e0ba89271 +Subproject commit 66325b8ab4f012c1261e88ae262d5cd2e3d54fd1 diff --git a/drivers/analog/ads1255.c b/drivers/analog/ads1255.c index 93bed6d2f6a..432b7dd7660 100644 --- a/drivers/analog/ads1255.c +++ b/drivers/analog/ads1255.c @@ -203,6 +203,7 @@ static void adc_reset(FAR struct adc_dev_s *dev) SPI_SETMODE(spi, SPIDEV_MODE1); SPI_SETBITS(spi, 8); + (void)SPI_HWFEATURES(spi, 0); SPI_SETFREQUENCY(spi, CONFIG_ADS1255_FREQUENCY); usleep(1000); SPI_SELECT(spi, priv->devno, true); diff --git a/drivers/analog/pga11x.c b/drivers/analog/pga11x.c index 7bb4a11bb0b..143b897bc9b 100644 --- a/drivers/analog/pga11x.c +++ b/drivers/analog/pga11x.c @@ -155,6 +155,7 @@ static void pga11x_configure(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_PGA11X_SPIMODE); SPI_SETBITS(spi, 8); + (void)SPI_HWFEATURES(spi, 0); (void)SPI_SETFREQUENCY(spi, CONFIG_PGA11X_SPIFREQUENCY); } diff --git a/drivers/audio/vs1053.c b/drivers/audio/vs1053.c index 35b0a956479..68167ca31eb 100644 --- a/drivers/audio/vs1053.c +++ b/drivers/audio/vs1053.c @@ -274,6 +274,7 @@ static void vs1053_spi_lock(FAR struct spi_dev_s *dev, unsigned long freq_mhz) SPI_SETMODE(dev, CONFIG_VS1053_SPIMODE); SPI_SETBITS(dev, 8); + (void)SPI_HWFEATURES(dev, 0); (void)SPI_SETFREQUENCY(dev, freq_mhz); } diff --git a/drivers/eeprom/spi_xx25xx.c b/drivers/eeprom/spi_xx25xx.c index 6fdc39458bb..1f9335b8567 100644 --- a/drivers/eeprom/spi_xx25xx.c +++ b/drivers/eeprom/spi_xx25xx.c @@ -288,6 +288,7 @@ static void ee25xx_lock(FAR struct spi_dev_s *dev) SPI_SETMODE(dev, CONFIG_EE25XX_SPIMODE); SPI_SETBITS(dev, 8); + (void)SPI_HWFEATURES(dev, 0); (void)SPI_SETFREQUENCY(dev, 10000000); /* This is the default speed */ } diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c index c0500229b59..d09afce3125 100644 --- a/drivers/input/ads7843e.c +++ b/drivers/input/ads7843e.c @@ -197,7 +197,8 @@ static void ads7843e_lock(FAR struct spi_dev_s *spi) SPI_SELECT(spi, SPIDEV_TOUCHSCREEN, true); SPI_SETMODE(spi, CONFIG_ADS7843E_SPIMODE); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, CONFIG_ADS7843E_FREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_ADS7843E_FREQUENCY); SPI_SELECT(spi, SPIDEV_TOUCHSCREEN, false); } #endif @@ -258,7 +259,8 @@ static inline void ads7843e_configspi(FAR struct spi_dev_s *spi) SPI_SELECT(spi, SPIDEV_TOUCHSCREEN, true); SPI_SETMODE(spi, CONFIG_ADS7843E_SPIMODE); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, CONFIG_ADS7843E_FREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_ADS7843E_FREQUENCY); SPI_SELECT(spi, SPIDEV_TOUCHSCREEN, false); } #endif diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c index fe87fc32fec..85a5b77347a 100644 --- a/drivers/input/max11802.c +++ b/drivers/input/max11802.c @@ -197,7 +197,8 @@ static void max11802_lock(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_MAX11802_SPIMODE); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, CONFIG_MAX11802_FREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_MAX11802_FREQUENCY); } #endif @@ -256,7 +257,8 @@ static inline void max11802_configspi(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_MAX11802_SPIMODE); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, CONFIG_MAX11802_FREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_MAX11802_FREQUENCY); } #endif diff --git a/drivers/lcd/memlcd.c b/drivers/lcd/memlcd.c index 06683ba0c94..c4a8a6e10fb 100644 --- a/drivers/lcd/memlcd.c +++ b/drivers/lcd/memlcd.c @@ -299,10 +299,11 @@ static inline void memlcd_configspi(FAR struct spi_dev_s *spi) #ifdef CONFIG_SPI_OWNBUS SPI_SETMODE(spi, MEMLCD_SPI_MODE); SPI_SETBITS(spi, MEMLCD_SPI_BITS); + (void)SPI_HWFEATURES(spi, 0); # ifdef CONFIG_MEMLCD_SPI_FREQUENCY - SPI_SETFREQUENCY(spi, CONFIG_MEMLCD_SPI_FREQUENCY); + (void)SPI_SETFREQUENCY(spi, CONFIG_MEMLCD_SPI_FREQUENCY); # else - SPI_SETFREQUENCY(spi, MEMLCD_SPI_FREQUENCY); + (void)SPI_SETFREQUENCY(spi, MEMLCD_SPI_FREQUENCY); # endif #endif } @@ -344,10 +345,11 @@ static void memlcd_select(FAR struct spi_dev_s *spi) */ SPI_SETMODE(spi, MEMLCD_SPI_MODE); SPI_SETBITS(spi, MEMLCD_SPI_BITS); + (void)SPI_HWFEATURES(spi, 0); # ifdef CONFIG_MEMLCD_SPI_FREQUENCY - SPI_SETFREQUENCY(spi, CONFIG_MEMLCD_SPI_FREQUENCY); + (void)SPI_SETFREQUENCY(spi, CONFIG_MEMLCD_SPI_FREQUENCY); # else - SPI_SETFREQUENCY(spi, MEMLCD_SPI_FREQUENCY); + (void)SPI_SETFREQUENCY(spi, MEMLCD_SPI_FREQUENCY); # endif } #endif diff --git a/drivers/lcd/nokia6100.c b/drivers/lcd/nokia6100.c index 735ae3c628e..d6f71590e98 100644 --- a/drivers/lcd/nokia6100.c +++ b/drivers/lcd/nokia6100.c @@ -678,7 +678,8 @@ static inline void nokia_configspi(FAR struct spi_dev_s *spi) #ifdef CONFIG_SPI_OWNBUS SPI_SETMODE(spi, CONFIG_NOKIA6100_SPIMODE); SPI_SETBITS(spi, CONFIG_NOKIA6100_WORDWIDTH); - SPI_SETFREQUENCY(spi, CONFIG_NOKIA6100_FREQUENCY) + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_NOKIA6100_FREQUENCY) #endif } @@ -723,7 +724,8 @@ static void nokia_select(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_NOKIA6100_SPIMODE); SPI_SETBITS(spi, CONFIG_NOKIA6100_WORDWIDTH); - SPI_SETFREQUENCY(spi, CONFIG_NOKIA6100_FREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_NOKIA6100_FREQUENCY); } #endif diff --git a/drivers/lcd/p14201.c b/drivers/lcd/p14201.c index a97a608e324..b79e036aed2 100644 --- a/drivers/lcd/p14201.c +++ b/drivers/lcd/p14201.c @@ -460,8 +460,9 @@ static inline void rit_configspi(FAR struct spi_dev_s *spi) #ifdef CONFIG_SPI_OWNBUS SPI_SETMODE(spi, CONFIG_P14201_SPIMODE); SPI_SETBITS(spi, 8); + (void)SPI_HWFEATURES(spi, 0); #ifdef CONFIG_P14201_FREQUENCY - SPI_SETFREQUENCY(spi, CONFIG_P14201_FREQUENCY) + (void)SPI_SETFREQUENCY(spi, CONFIG_P14201_FREQUENCY) #endif #endif } @@ -505,8 +506,9 @@ static void rit_select(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_P14201_SPIMODE); SPI_SETBITS(spi, 8); + (void)SPI_HWFEATURES(spi, 0); #ifdef CONFIG_P14201_FREQUENCY - SPI_SETFREQUENCY(spi, CONFIG_P14201_FREQUENCY); + (void)SPI_SETFREQUENCY(spi, CONFIG_P14201_FREQUENCY); #endif } #endif diff --git a/drivers/lcd/ssd1306_base.c b/drivers/lcd/ssd1306_base.c index a47fb590bcd..13d0a7195d5 100644 --- a/drivers/lcd/ssd1306_base.c +++ b/drivers/lcd/ssd1306_base.c @@ -824,15 +824,16 @@ FAR struct lcd_dev_s *ssd1306_initialize(FAR struct i2c_dev_s *dev, unsigned int */ # ifdef CONFIG_SPI_OWNBUS - /* Configure SPI */ + /* Configure SPI */ - SPI_SETMODE(priv->spi, CONFIG_SSD1306_SPIMODE); - SPI_SETBITS(priv->spi, 8); - SPI_SETFREQUENCY(priv->spi, CONFIG_SSD1306_FREQUENCY); + SPI_SETMODE(priv->spi, CONFIG_SSD1306_SPIMODE); + SPI_SETBITS(priv->spi, 8); + (void)SPI_HWFEATURES(priv->spi, 0); + (void)SPI_SETFREQUENCY(priv->spi, CONFIG_SSD1306_FREQUENCY); # else - /* Configure the SPI */ + /* Configure the SPI */ - ssd1306_configspi(priv->spi); + ssd1306_configspi(priv->spi); # endif #else diff --git a/drivers/lcd/ssd1306_spi.c b/drivers/lcd/ssd1306_spi.c index 78fcdbb6014..fedc3eae9d1 100644 --- a/drivers/lcd/ssd1306_spi.c +++ b/drivers/lcd/ssd1306_spi.c @@ -71,7 +71,8 @@ static inline void ssd1306_configspi(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_SSD1306_SPIMODE); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, CONFIG_SSD1306_FREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_SSD1306_FREQUENCY); } #endif diff --git a/drivers/lcd/ssd1351.c b/drivers/lcd/ssd1351.c index 45e768a879a..30178930a26 100644 --- a/drivers/lcd/ssd1351.c +++ b/drivers/lcd/ssd1351.c @@ -510,7 +510,8 @@ static void ssd1351_select(FAR struct ssd1351_dev_s *priv) #ifndef CONFIG_SPI_OWNBUS SPI_SETMODE(spi, CONFIG_SSD1351_SPIMODE); SPI_SETBITS(spi, SSD1351_SPIBITS); - SPI_SETFREQUENCY(spi, CONFIG_SSD1351_SPIFREQ); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_SSD1351_SPIFREQ); #endif } #endif @@ -1196,7 +1197,8 @@ FAR struct lcd_dev_s *ssd1351_initialize(FAR struct spi_dev_s *spi, #ifdef CONFIG_SPI_OWNBUS SPI_SETMODE(spi, CONFIG_SSD1351_SPIMODE); SPI_SETBITS(spi, SSD1351_SPIBITS); - SPI_SETFREQUENCY(spi, CONFIG_SSD1351_SPIFREQ); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_SSD1351_SPIFREQ); #endif #endif diff --git a/drivers/lcd/st7567.c b/drivers/lcd/st7567.c index 33d4a773ef6..1a597f22e48 100644 --- a/drivers/lcd/st7567.c +++ b/drivers/lcd/st7567.c @@ -394,8 +394,9 @@ static void st7567_select(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_ST7567_SPIMODE); SPI_SETBITS(spi, 8); + (void)SPI_HWFEATURES(spi, 0); #ifdef CONFIG_ST7567_FREQUENCY - SPI_SETFREQUENCY(spi, CONFIG_ST7567_FREQUENCY); + (void)SPI_SETFREQUENCY(spi, CONFIG_ST7567_FREQUENCY); #endif } #endif diff --git a/drivers/lcd/ug-2864ambag01.c b/drivers/lcd/ug-2864ambag01.c index ffc3a8a8b16..1d1b773316a 100644 --- a/drivers/lcd/ug-2864ambag01.c +++ b/drivers/lcd/ug-2864ambag01.c @@ -436,7 +436,8 @@ static inline void ug2864ambag01_configspi(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_UG2864AMBAG01_SPIMODE); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, CONFIG_UG2864AMBAG01_FREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_UG2864AMBAG01_FREQUENCY); } #endif @@ -469,7 +470,8 @@ static inline void ug2864ambag01_lock(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_UG2864AMBAG01_SPIMODE); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, CONFIG_UG2864AMBAG01_FREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_UG2864AMBAG01_FREQUENCY); } #endif diff --git a/drivers/lcd/ug-9664hswag01.c b/drivers/lcd/ug-9664hswag01.c index 5a567688ace..be97d551b0e 100644 --- a/drivers/lcd/ug-9664hswag01.c +++ b/drivers/lcd/ug-9664hswag01.c @@ -438,8 +438,9 @@ static void ug_select(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_UG9664HSWAG01_SPIMODE); SPI_SETBITS(spi, 8); + (void)SPI_HWFEATURES(spi, 0); #ifdef CONFIG_UG9664HSWAG01_FREQUENCY - SPI_SETFREQUENCY(spi, CONFIG_UG9664HSWAG01_FREQUENCY); + (void)SPI_SETFREQUENCY(spi, CONFIG_UG9664HSWAG01_FREQUENCY); #endif } #endif diff --git a/drivers/mmcsd/mmcsd_spi.c b/drivers/mmcsd/mmcsd_spi.c index b5ab0cd8e3a..e4cfc4ecda6 100644 --- a/drivers/mmcsd/mmcsd_spi.c +++ b/drivers/mmcsd/mmcsd_spi.c @@ -365,9 +365,10 @@ static void mmcsd_semtake(FAR struct mmcsd_slot_s *slot) * changed those since the last time that we had the SPI bus. */ - SPI_SETFREQUENCY(slot->spi, slot->spispeed); SPI_SETMODE(slot->spi, CONFIG_MMCSD_SPIMODE); SPI_SETBITS(slot->spi, 8); + (void)SPI_HWFEATURES(slot->spi, 0); + (void)SPI_SETFREQUENCY(slot->spi, slot->spispeed); #endif /* Get exclusive access to the MMC/SD device (possibly unnecessary if @@ -425,6 +426,7 @@ static inline void mmcsd_spiinit(FAR struct mmcsd_slot_s *slot) { SPI_SETMODE(slot->spi, CONFIG_MMCSD_SPIMODE); SPI_SETBITS(slot->spi, 8); + (void)SPI_HWFEATURES(slot->spi, 0); } #endif @@ -1608,7 +1610,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot) #ifndef CONFIG_SPI_OWNBUS slot->spispeed = MMCSD_IDMODE_CLOCK; #endif - SPI_SETFREQUENCY(spi, MMCSD_IDMODE_CLOCK); + (void)SPI_SETFREQUENCY(spi, MMCSD_IDMODE_CLOCK); /* Set the maximum access time out */ diff --git a/drivers/mtd/at25.c b/drivers/mtd/at25.c index 87b08405a4e..8ab7c1728cb 100644 --- a/drivers/mtd/at25.c +++ b/drivers/mtd/at25.c @@ -191,6 +191,7 @@ static void at25_lock(FAR struct spi_dev_s *dev) SPI_SETMODE(dev, CONFIG_AT25_SPIMODE); SPI_SETBITS(dev, 8); + (void)SPI_HWFEATURES(dev, 0); (void)SPI_SETFREQUENCY(dev, CONFIG_AT25_SPIFREQUENCY); } diff --git a/drivers/mtd/at45db.c b/drivers/mtd/at45db.c index 0fb7d8018d6..a76994d5e4c 100644 --- a/drivers/mtd/at45db.c +++ b/drivers/mtd/at45db.c @@ -292,6 +292,7 @@ static void at45db_lock(FAR struct at45db_dev_s *priv) SPI_SETMODE(priv->spi, SPIDEV_MODE0); SPI_SETBITS(priv->spi, 8); + (void)SPI_HWFEATURES(priv->spi, 0); (void)SPI_SETFREQUENCY(priv->spi, CONFIG_AT45DB_FREQUENCY); } diff --git a/drivers/mtd/m25px.c b/drivers/mtd/m25px.c index 60eba9558a8..f1b71dfc11f 100644 --- a/drivers/mtd/m25px.c +++ b/drivers/mtd/m25px.c @@ -284,6 +284,7 @@ static void m25p_lock(FAR struct spi_dev_s *dev) SPI_SETMODE(dev, CONFIG_M25P_SPIMODE); SPI_SETBITS(dev, 8); + (void)SPI_HWFEATURES(dev, 0); (void)SPI_SETFREQUENCY(dev, 20000000); } diff --git a/drivers/mtd/ramtron.c b/drivers/mtd/ramtron.c index b800d0f27cf..89e0ade8597 100644 --- a/drivers/mtd/ramtron.c +++ b/drivers/mtd/ramtron.c @@ -343,6 +343,7 @@ static void ramtron_lock(FAR struct ramtron_dev_s *priv) SPI_SETMODE(dev, SPIDEV_MODE3); SPI_SETBITS(dev, 8); + (void)SPI_HWFEATURES(dev, 0); (void)SPI_SETFREQUENCY(dev, priv->speed); } diff --git a/drivers/mtd/sst25.c b/drivers/mtd/sst25.c index 3a3db16e19d..2a9b3e50f01 100644 --- a/drivers/mtd/sst25.c +++ b/drivers/mtd/sst25.c @@ -286,6 +286,7 @@ static void sst25_lock(FAR struct spi_dev_s *dev) SPI_SETMODE(dev, CONFIG_SST25_SPIMODE); SPI_SETBITS(dev, 8); + (void)SPI_HWFEATURES(dev, 0); (void)SPI_SETFREQUENCY(dev, CONFIG_SST25_SPIFREQUENCY); } diff --git a/drivers/mtd/sst25xx.c b/drivers/mtd/sst25xx.c index 8598dd51d72..3a1c086c250 100644 --- a/drivers/mtd/sst25xx.c +++ b/drivers/mtd/sst25xx.c @@ -236,6 +236,7 @@ static void sst25xx_lock(FAR struct spi_dev_s *dev) SPI_SETMODE(dev, CONFIG_SST25XX_SPIMODE); SPI_SETBITS(dev, 8); + (void)SPI_HWFEATURES(dev, 0); (void)SPI_SETFREQUENCY(dev, CONFIG_SST25XX_SPIFREQUENCY); } diff --git a/drivers/mtd/w25.c b/drivers/mtd/w25.c index df5ec83df6e..1ea22d5bc3c 100644 --- a/drivers/mtd/w25.c +++ b/drivers/mtd/w25.c @@ -310,6 +310,7 @@ static void w25_lock(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_W25_SPIMODE); SPI_SETBITS(spi, 8); + (void)SPI_HWFEATURES(spi, 0); (void)SPI_SETFREQUENCY(spi, CONFIG_W25_SPIFREQUENCY); } diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index b619c59b31b..43d0e6c6859 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c @@ -381,7 +381,8 @@ static inline void enc_configspi(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_ENC28J60_SPIMODE); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, CONFIG_ENC28J60_FREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_ENC28J60_FREQUENCY); } #endif @@ -416,7 +417,8 @@ static void enc_lock(FAR struct enc_driver_s *priv) SPI_SETMODE(priv->spi, CONFIG_ENC28J60_SPIMODE); SPI_SETBITS(priv->spi, 8); - SPI_SETFREQUENCY(priv->spi, CONFIG_ENC28J60_FREQUENCY); + (void)SPI_HWFEATURES(priv->spi, 0); + (void)SPI_SETFREQUENCY(priv->spi, CONFIG_ENC28J60_FREQUENCY); } #endif diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c index fcd36f87a0c..8c5e57e2559 100644 --- a/drivers/net/encx24j600.c +++ b/drivers/net/encx24j600.c @@ -404,7 +404,8 @@ static inline void enc_configspi(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_ENCX24J600_SPIMODE); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, CONFIG_ENCX24J600_FREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_ENCX24J600_FREQUENCY); } #endif @@ -439,7 +440,8 @@ static void enc_lock(FAR struct enc_driver_s *priv) SPI_SETMODE(priv->spi, CONFIG_ENCX24J600_SPIMODE); SPI_SETBITS(priv->spi, 8); - SPI_SETFREQUENCY(priv->spi, CONFIG_ENCX24J600_FREQUENCY); + (void)SPI_HWFEATURES(priv->spi, 0); + (void)SPI_SETFREQUENCY(priv->spi, CONFIG_ENCX24J600_FREQUENCY); } #endif diff --git a/drivers/sensors/adxl345_base.c b/drivers/sensors/adxl345_base.c index d761702a339..dfca4e30d0f 100644 --- a/drivers/sensors/adxl345_base.c +++ b/drivers/sensors/adxl345_base.c @@ -419,7 +419,8 @@ ADXL345_HANDLE adxl345_instantiate(FAR struct i2c_dev_s *dev, SPI_SETMODE(priv->spi, SPIDEV_MODE3); SPI_SETBITS(priv->spi, 8); - SPI_SETFREQUENCY(priv->spi, ADXL345_SPI_MAXFREQUENCY); + (void)SPI_HWFEATURES(priv->spi, 0); + (void)SPI_SETFREQUENCY(priv->spi, ADXL345_SPI_MAXFREQUENCY); #endif #else diff --git a/drivers/sensors/adxl345_spi.c b/drivers/sensors/adxl345_spi.c index 0c9cf0b118e..381eec64b75 100644 --- a/drivers/sensors/adxl345_spi.c +++ b/drivers/sensors/adxl345_spi.c @@ -71,7 +71,8 @@ static inline void adxl345_configspi(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, SPIDEV_MODE3); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, ADXL345_SPI_MAXFREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, ADXL345_SPI_MAXFREQUENCY); } #endif diff --git a/drivers/sensors/max31855.c b/drivers/sensors/max31855.c index fae6d8783e6..7fc21f43563 100644 --- a/drivers/sensors/max31855.c +++ b/drivers/sensors/max31855.c @@ -284,7 +284,8 @@ int max31855_register(FAR const char *devpath, FAR struct spi_dev_s *spi) SPI_SETMODE(priv->spi, SPIDEV_MODE1); SPI_SETBITS(priv->spi, 8); - SPI_SETFREQUENCY(priv->spi, MAX31855_SPI_MAXFREQ); + (void)SPI_HWFEATURES(priv->spi, 0); + (void)SPI_SETFREQUENCY(priv->spi, MAX31855_SPI_MAXFREQ); #endif /* Register the character driver */ diff --git a/drivers/sensors/max6675.c b/drivers/sensors/max6675.c index a39544ecea5..7c2404d1766 100644 --- a/drivers/sensors/max6675.c +++ b/drivers/sensors/max6675.c @@ -261,7 +261,8 @@ int max6675_register(FAR const char *devpath, FAR struct spi_dev_s *spi) SPI_SETMODE(priv->spi, SPIDEV_MODE1); SPI_SETBITS(priv->spi, 8); - SPI_SETFREQUENCY(priv->spi, MAX6675_SPI_MAXFREQ); + (void)SPI_HWFEATURES(priv->spi, 0); + (void)SPI_SETFREQUENCY(priv->spi, MAX6675_SPI_MAXFREQ); #endif /* Register the character driver */ diff --git a/drivers/sensors/mpl115a.c b/drivers/sensors/mpl115a.c index 86a92dfe252..ba43af3aa84 100644 --- a/drivers/sensors/mpl115a.c +++ b/drivers/sensors/mpl115a.c @@ -119,7 +119,8 @@ static inline void mpl115a_configspi(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, SPIDEV_MODE0); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, MPL115A_SPI_MAXFREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, MPL115A_SPI_MAXFREQUENCY); } #endif diff --git a/drivers/wireless/cc1101.c b/drivers/wireless/cc1101.c index bd86776bbd0..8d8958fc728 100644 --- a/drivers/wireless/cc1101.c +++ b/drivers/wireless/cc1101.c @@ -313,6 +313,7 @@ void cc1101_access_begin(FAR struct cc1101_dev_s * dev) SPI_SELECT(dev->spi, SPIDEV_WIRELESS, true); SPI_SETMODE(dev->spi, SPIDEV_MODE0); /* CPOL=0, CPHA=0 */ SPI_SETBITS(dev->spi, 8); + (void)SPI_HWFEATURES(dev->spi, 0); } void cc1101_access_end(FAR struct cc1101_dev_s * dev) diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c index 0434cdbacd0..9e7e9d2c0c5 100644 --- a/drivers/wireless/cc3000/cc3000.c +++ b/drivers/wireless/cc3000/cc3000.c @@ -259,7 +259,8 @@ static inline void cc3000_configspi(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, CONFIG_CC3000_SPI_MODE); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, CONFIG_CC3000_SPI_FREQUENCY); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_CC3000_SPI_FREQUENCY); } /**************************************************************************** diff --git a/drivers/wireless/nrf24l01.c b/drivers/wireless/nrf24l01.c index 607a56a1aa3..430c0b5b7af 100644 --- a/drivers/wireless/nrf24l01.c +++ b/drivers/wireless/nrf24l01.c @@ -267,7 +267,8 @@ static void nrf24l01_lock(FAR struct spi_dev_s *spi) SPI_SELECT(spi, SPIDEV_WIRELESS, true); SPI_SETMODE(spi, SPIDEV_MODE0); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, NRF24L01_SPIFREQ); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, NRF24L01_SPIFREQ); SPI_SELECT(spi, SPIDEV_WIRELESS, false); } #endif @@ -328,7 +329,8 @@ static inline void nrf24l01_configspi(FAR struct spi_dev_s *spi) SPI_SELECT(spi, SPIDEV_WIRELESS, true); /* Useful ? */ SPI_SETMODE(spi, SPIDEV_MODE0); SPI_SETBITS(spi, 8); - SPI_SETFREQUENCY(spi, NRF24L01_SPIFREQ); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, NRF24L01_SPIFREQ); SPI_SELECT(spi, SPIDEV_WIRELESS, false); } #endif diff --git a/drivers/wireless/pn532.c b/drivers/wireless/pn532.c index d4299489576..1596db3a6e9 100644 --- a/drivers/wireless/pn532.c +++ b/drivers/wireless/pn532.c @@ -150,7 +150,8 @@ static void pn532_lock(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, SPIDEV_MODE0); SPI_SETBITS(spi, -8); - SPI_SETFREQUENCY(spi, CONFIG_PN532_SPI_FREQ); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_PN532_SPI_FREQ); } #endif @@ -170,7 +171,8 @@ static inline void pn532_configspi(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, SPIDEV_MODE0); SPI_SETBITS(spi, -8); - SPI_SETFREQUENCY(spi, CONFIG_PN532_SPI_FREQ); + (void)SPI_HWFEATURES(spi, 0); + (void)SPI_SETFREQUENCY(spi, CONFIG_PN532_SPI_FREQ); } #endif