michaelh/zephyr
1
0
Fork 0
Code Releases Activity

modules: hal_nordic: Update nrfx to version 2.1.0

Browse source 
Update the hal_nordic module revision, to switch to nrfx 2.1.0.

Because the list of peripherals for nRF5340 has changed as follows:
- SPIM2 has been renamed to SPIM4
- SPIM2-3, SPIS2-3, TWIM2-3, TWIS2-3, and UARTE2-3 have been added
a couple of related corrections needed to be applied in dts and Kconfig
files, plus the spi_nrfx_spim driver has been extended with the support
for SPIM4.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2020-01-24 16:22:50 +01:00 • committed by Carles Cufí
commit 7899b1f5b6
11 changed files with 190 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

91
dts/arm/nordic/nrf5340_cpuapp_common.dtsi
View file

@ -140,6 +140,22 @@ uart1: uart@9000 {
label = "UART_1";
};
uart2: uart@b000 {
compatible = "nordic,nrf-uarte";
reg = <0xb000 0x1000>;
interrupts = <11 1>;
status = "disabled";
label = "UART_2";
};
uart3: uart@c000 {
compatible = "nordic,nrf-uarte";
reg = <0xc000 0x1000>;
interrupts = <12 1>;
status = "disabled";
label = "UART_3";
};
i2c0: i2c@8000 {
/*
* This i2c node can be either TWIM or TWIS, for the user to pick:
@ -171,6 +187,38 @@ i2c1: i2c@9000 {
label = "I2C_1";
};
i2c2: i2c@b000 {
/*
* This i2c node can be TWIM or TWIS,
* for the user to pick:
* compatible = "nordic,nrf-twim" or
* "nordic,nrf-twis".
*/
#address-cells = <1>;
#size-cells = <0>;
reg = <0xb000 0x1000>;
clock-frequency = <I2C_BITRATE_STANDARD>;
interrupts = <11 1>;
status = "disabled";
label = "I2C_2";
};
i2c3: i2c@c000 {
/*
* This i2c node can be TWIM or TWIS,
* for the user to pick:
* compatible = "nordic,nrf-twim" or
* "nordic,nrf-twis".
*/
#address-cells = <1>;
#size-cells = <0>;
reg = <0xc000 0x1000>;
clock-frequency = <I2C_BITRATE_STANDARD>;
interrupts = <12 1>;
status = "disabled";
label = "I2C_3";
};
spi0: spi@8000 {
/*
* This spi node can be either SPIM or SPIS,
@ -201,14 +249,44 @@ spi1: spi@9000 {
label = "SPI_1";
};
spi2: spi@a000 {
spi2: spi@b000 {
/*
* This spi node can be either SPIM or SPIS,
* for the user to pick:
* compatible = "nordic,nrf-spim" or
* "nordic,nrf-spis".
*/
#address-cells = <1>;
#size-cells = <0>;
reg = <0xb000 0x1000>;
interrupts = <11 1>;
status = "disabled";
label = "SPI_2";
};
spi3: spi@c000 {
/*
* This spi node can be either SPIM or SPIS,
* for the user to pick:
* compatible = "nordic,nrf-spim" or
* "nordic,nrf-spis".
*/
#address-cells = <1>;
#size-cells = <0>;
reg = <0xc000 0x1000>;
interrupts = <12 1>;
status = "disabled";
label = "SPI_3";
};
spi4: spi@a000 {
compatible = "nordic,nrf-spim";
#address-cells = <1>;
#size-cells = <0>;
reg = <0xa000 0x1000>;
interrupts = <10 1>;
status = "disabled";
label = "SPI_2";
label = "SPI_4";
};
pwm0: pwm@21000 {
@ -238,6 +316,15 @@ pwm2: pwm@23000 {
#pwm-cells = <1>;
};
pwm3: pwm@24000 {
compatible = "nordic,nrf-pwm";
reg = <0x24000 0x1000>;
interrupts = <36 1>;
status = "disabled";
label = "PWM_3";
#pwm-cells = <1>;
};
gpio0: gpio@842500 {
compatible = "nordic,nrf-gpio";
gpio-controller;