Skip to content

Commit 09c0954

Browse files
nika-nordicnordicjm
authored andcommitted
[nrf fromtree] soc: nordic: add support for SPIS120 instance
It is defined as spis120 rather than spi120, because spi120 is already used for SPIM120 hardware instance, but their base address is different. Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no> (cherry picked from commit d8506af12aff17e5a86c1f8b457723eb104ea6c0)
1 parent 113af64 commit 09c0954

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

dts/common/nordic/nrf54h20.dtsi

+16-4
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,20 @@
661661
#pwm-cells = <3>;
662662
};
663663

664+
spis120: spi@8e5000 {
665+
compatible = "nordic,nrf-spis";
666+
reg = <0x8e5000 0x1000>;
667+
status = "disabled";
668+
power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
669+
easydma-maxcnt-bits = <15>;
670+
interrupts = <229 NRF_DEFAULT_IRQ_PRIORITY>;
671+
clocks = <&hsfll120>;
672+
max-frequency = <DT_FREQ_M(32)>;
673+
#address-cells = <1>;
674+
#size-cells = <0>;
675+
nordic,clockpin-enable = <NRF_FUN_SPIS_SCK>;
676+
};
677+
664678
spi120: spi@8e6000 {
665679
compatible = "nordic,nrf-spim";
666680
reg = <0x8e6000 0x1000>;
@@ -674,8 +688,7 @@
674688
#size-cells = <0>;
675689
rx-delay-supported;
676690
rx-delay = <1>;
677-
nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>,
678-
<NRF_FUN_SPIS_SCK>;
691+
nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>;
679692
};
680693

681694
uart120: uart@8e6000 {
@@ -702,8 +715,7 @@
702715
#size-cells = <0>;
703716
rx-delay-supported;
704717
rx-delay = <1>;
705-
nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>,
706-
<NRF_FUN_SPIS_SCK>;
718+
nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>;
707719
};
708720

709721
cpuppr_vpr: vpr@908000 {

modules/hal_nordic/nrfx/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ config NRFX_SPIS30
639639

640640
config NRFX_SPIS120
641641
bool "SPIS120 driver instance"
642-
depends on $(dt_nodelabel_exists,spi120)
642+
depends on $(dt_nodelabel_exists,spis120)
643643
select NRFX_SPIS
644644

645645
config NRFX_SPIS130

soc/nordic/common/Kconfig.peripherals

+1-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ config HAS_HW_NRF_SPIS30
342342
def_bool $(dt_nodelabel_enabled_with_compat,spi30,$(DT_COMPAT_NORDIC_NRF_SPIS))
343343

344344
config HAS_HW_NRF_SPIS120
345-
def_bool $(dt_nodelabel_enabled_with_compat,spi120,$(DT_COMPAT_NORDIC_NRF_SPIS))
345+
def_bool $(dt_nodelabel_enabled_with_compat,spis120,$(DT_COMPAT_NORDIC_NRF_SPIS))
346346

347347
config HAS_HW_NRF_SPIS130
348348
def_bool $(dt_nodelabel_enabled_with_compat,spi130,$(DT_COMPAT_NORDIC_NRF_SPIS))

soc/nordic/validate_base_addresses.c

+1
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ CHECK_DT_REG(spi134, NRF_SPIM134);
277277
CHECK_DT_REG(spi135, NRF_SPIM135);
278278
CHECK_DT_REG(spi136, NRF_SPIM136);
279279
CHECK_DT_REG(spi137, NRF_SPIM137);
280+
CHECK_DT_REG(spis120, NRF_SPIS120);
280281
CHECK_DT_REG(spu, NRF_SPU);
281282
CHECK_DT_REG(swi0, NRF_SWI0);
282283
CHECK_DT_REG(swi1, NRF_SWI1);

0 commit comments

Comments
 (0)