Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modules: Facilitate the use of nrfx drivers #18895

Merged
merged 4 commits into from
Sep 10, 2019
Merged

modules: Facilitate the use of nrfx drivers #18895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
135846e
modules: Kconfig: Unify the way of enabling instances in nrfx drivers
anangl Sep 3, 2019
1596419
modules: Kconfig: Make options enabling nrfx drivers easier to access
anangl Sep 3, 2019
9774c20
modules: Kconfig: Add missing options enabling nrfx drivers
anangl Sep 3, 2019
5316f04
modules: hal: nordic: Update the module revision
anangl Sep 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions drivers/i2c/Kconfig.nrfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ choice I2C_0_NRF_TYPE
config I2C_0_NRF_TWI
bool "nRF TWI 0"
depends on HAS_HW_NRF_TWI0
select NRFX_TWI
select NRFX_TWI0
help
Enable nRF TWI Master without EasyDMA on port 0.

config I2C_0_NRF_TWIM
bool "nRF TWIM 0"
depends on HAS_HW_NRF_TWIM0
select NRFX_TWIM
select NRFX_TWIM0
help
Enable nRF TWI Master with EasyDMA on port 0.
This peripheral accepts transfers from RAM only,
Expand All @@ -59,14 +59,14 @@ choice I2C_1_NRF_TYPE
config I2C_1_NRF_TWI
bool "nRF TWI 1"
depends on HAS_HW_NRF_TWI1
select NRFX_TWI
select NRFX_TWI1
help
Enable nRF TWI Master without EasyDMA on port 1.

config I2C_1_NRF_TWIM
bool "nRF TWIM 1"
depends on HAS_HW_NRF_TWIM1
select NRFX_TWIM
select NRFX_TWIM1
help
Enable nRF TWI Master with EasyDMA on port 1.
This peripheral accepts transfers from RAM only,
Expand All @@ -87,7 +87,7 @@ choice I2C_2_NRF_TYPE
config I2C_2_NRF_TWIM
bool "nRF TWIM 2"
depends on HAS_HW_NRF_TWIM2
select NRFX_TWIM
select NRFX_TWIM2
help
Enable nRF TWI Master with EasyDMA on port 2.
This peripheral accepts transfers from RAM only,
Expand All @@ -108,7 +108,7 @@ choice I2C_3_NRF_TYPE
config I2C_3_NRF_TWIM
bool "nRF TWIM 3"
depends on HAS_HW_NRF_TWIM3
select NRFX_TWIM
select NRFX_TWIM3
help
Enable nRF TWI Master with EasyDMA on port 3.
This peripheral accepts transfers from RAM only,
Expand Down
5 changes: 4 additions & 1 deletion drivers/pwm/Kconfig.nrfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ menuconfig PWM_NRFX
default y
depends on HAS_HW_NRF_PWM0 || HAS_HW_NRF_PWM1 || \
HAS_HW_NRF_PWM2 || HAS_HW_NRF_PWM3
select NRFX_PWM
select NRFX_PWM0 if PWM_0
select NRFX_PWM1 if PWM_1
select NRFX_PWM2 if PWM_2
select NRFX_PWM3 if PWM_3
help
Enable support for nrfx Hardware PWM driver for nRF52 MCU series.
22 changes: 11 additions & 11 deletions drivers/spi/Kconfig.nrfx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ choice
config SPI_0_NRF_SPI
bool "nRF SPI 0"
depends on HAS_HW_NRF_SPI0
select NRFX_SPI
select NRFX_SPI0
help
Enable nRF SPI Master without EasyDMA on port 0.

Expand All @@ -51,15 +51,15 @@ config SPI_0_NRF_SPIM
# (SPIM: An additional byte is clocked out when RXD.MAXCNT == 1 and TXD.MAXCNT <= 1)
# Allow the 'EasyDMA' driver only if this automatic safety-disable is overridden
depends on HAS_HW_NRF_SPIM0 && (!SOC_NRF52832 || SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58)
select NRFX_SPIM
select NRFX_SPIM0
help
Enable nRF SPI Master with EasyDMA on port 0.

config SPI_0_NRF_SPIS
bool "nRF SPIS 0"
depends on HAS_HW_NRF_SPIS0
depends on SPI_SLAVE
select NRFX_SPIS
select NRFX_SPIS0
help
Enable nRF SPI Slave with EasyDMA on port 0.
Due to hardware limitations the implementation supports only simple
Expand Down Expand Up @@ -92,7 +92,7 @@ choice
config SPI_1_NRF_SPI
bool "nRF SPI 1"
depends on HAS_HW_NRF_SPI1
select NRFX_SPI
select NRFX_SPI1
help
Enable nRF SPI Master without EasyDMA on port 1.

Expand All @@ -102,15 +102,15 @@ config SPI_1_NRF_SPIM
# (SPIM: An additional byte is clocked out when RXD.MAXCNT == 1 and TXD.MAXCNT <= 1)
# Allow the 'EasyDMA' driver only if this automatic safety-disable is overridden
depends on HAS_HW_NRF_SPIM1 && (!SOC_NRF52832 || SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58)
select NRFX_SPIM
select NRFX_SPIM1
help
Enable nRF SPI Master with EasyDMA on port 1.

config SPI_1_NRF_SPIS
bool "nRF SPIS 1"
depends on HAS_HW_NRF_SPIS1
depends on SPI_SLAVE
select NRFX_SPIS
select NRFX_SPIS1
help
Enable nRF SPI Slave with EasyDMA on port 1.
Due to hardware limitations the implementation supports only simple
Expand Down Expand Up @@ -143,7 +143,7 @@ choice
config SPI_2_NRF_SPI
bool "nRF SPI 2"
depends on HAS_HW_NRF_SPI2
select NRFX_SPI
select NRFX_SPI2
help
Enable nRF SPI Master without EasyDMA on port 2.

Expand All @@ -153,15 +153,15 @@ config SPI_2_NRF_SPIM
# (SPIM: An additional byte is clocked out when RXD.MAXCNT == 1 and TXD.MAXCNT <= 1)
# Allow the 'EasyDMA' driver only if this automatic safety-disable is overridden
depends on HAS_HW_NRF_SPIM2 && (!SOC_NRF52832 || SOC_NRF52832_ALLOW_SPIM_DESPITE_PAN_58)
select NRFX_SPIM
select NRFX_SPIM2
help
Enable nRF SPI Master with EasyDMA on port 2.

config SPI_2_NRF_SPIS
bool "nRF SPIS 2"
depends on HAS_HW_NRF_SPIS2
depends on SPI_SLAVE
select NRFX_SPIS
select NRFX_SPIS2
help
Enable nRF SPI Slave with EasyDMA on port 2.
Due to hardware limitations the implementation supports only simple
Expand Down Expand Up @@ -194,15 +194,15 @@ choice
config SPI_3_NRF_SPIM
bool "nRF SPIM 3"
depends on HAS_HW_NRF_SPIM3
select NRFX_SPIM
select NRFX_SPIM3
help
Enable nRF SPI Master with EasyDMA on port 3.

config SPI_3_NRF_SPIS
bool "nRF SPIS 3"
depends on HAS_HW_NRF_SPIS3
depends on SPI_SLAVE
select NRFX_SPIS
select NRFX_SPIS3
help
Enable nRF SPI Slave with EasyDMA on port 3.
Due to hardware limitations the implementation supports only simple
Expand Down
Loading