michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: nrfx: Allow simultaneous use of SPI_0 and I2C_0 on nRF52810

Browse source 
In most Nordic SoCs the SPI and TWI peripherals with the same instance
number share certain resources and cannot be used at the same time.
In nRF52810 there are only single instances of these peripherals and
they are arranged in a different way so this limitation does not apply.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2018-08-09 12:01:01 +02:00 • committed by Anas Nashif
commit 2469097b34
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/i2c/Kconfig.nrfx
View file

@ -16,8 +16,11 @@ menuconfig I2C_NRFX
if I2C_NRFX if I2C_NRFX
# Nordic TWIx0 and SPIx0 instances can not be used at the same time. # In most Nordic SoCs the SPI and TWI peripherals with the same instance
if I2C_0 && !SPI_0 # number share certain resources and cannot be used at the same time.
# In nRF52810 there are only single instances of these peripherals and
# they are arranged in a different way so this limitation does not apply.
if I2C_0 && (!SPI_0 || SOC_NRF52810)
choice I2C_0_NRF_TYPE choice I2C_0_NRF_TYPE
prompt "I2C Port 0 Driver type" prompt "I2C Port 0 Driver type"
@ -40,7 +43,7 @@ config I2C_0_NRF_TWIM
endchoice endchoice
endif # I2C_0 && !SPI_0 endif # I2C_0 && (!SPI_0 || SOC_NRF52810)
# Nordic TWIx1 and SPIx1 instances can not be used at the same time. # Nordic TWIx1 and SPIx1 instances can not be used at the same time.
if I2C_1 && !SPI_1 if I2C_1 && !SPI_1

9
drivers/spi/Kconfig.nrfx
View file

@ -13,8 +13,11 @@ menuconfig SPI_NRFX
if SPI_NRFX if SPI_NRFX
# Nordic TWIx0 and SPIx0 instances can not be used at the same time. # In most Nordic SoCs the SPI and TWI peripherals with the same instance
if SPI_0 && !I2C_0 # number share certain resources and cannot be used at the same time.
# In nRF52810 there are only single instances of these peripherals and
# they are arranged in a different way so this limitation does not apply.
if SPI_0 && (!I2C_0 || SOC_NRF52810)
choice choice
prompt "SPI Port 0 Driver type" prompt "SPI Port 0 Driver type"
@ -99,7 +102,7 @@ config SPI_0_NRF_DEF
endif # SPI_0_NRF_SPIS endif # SPI_0_NRF_SPIS
endif # SPI_0 && !I2C_0 endif # SPI_0 && (!I2C_0 || SOC_NRF52810)
# Nordic TWIx1 and SPIx1 instances can not be used at the same time. # Nordic TWIx1 and SPIx1 instances can not be used at the same time.
if SPI_1 && !I2C_1 if SPI_1 && !I2C_1