Skip to content

Commit d8506af

Browse files
nika-nordickartben
authored andcommitted
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 <[email protected]>
1 parent c0362a9 commit d8506af

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

dts/common/nordic/nrf54h20.dtsi

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,20 @@
649649
#pwm-cells = <3>;
650650
};
651651

652+
spis120: spi@8e5000 {
653+
compatible = "nordic,nrf-spis";
654+
reg = <0x8e5000 0x1000>;
655+
status = "disabled";
656+
power-domains = <&gpd NRF_GPD_FAST_ACTIVE1>;
657+
easydma-maxcnt-bits = <15>;
658+
interrupts = <229 NRF_DEFAULT_IRQ_PRIORITY>;
659+
clocks = <&hsfll120>;
660+
max-frequency = <DT_FREQ_M(32)>;
661+
#address-cells = <1>;
662+
#size-cells = <0>;
663+
nordic,clockpin-enable = <NRF_FUN_SPIS_SCK>;
664+
};
665+
652666
spi120: spi@8e6000 {
653667
compatible = "nordic,nrf-spim";
654668
reg = <0x8e6000 0x1000>;
@@ -662,8 +676,7 @@
662676
#size-cells = <0>;
663677
rx-delay-supported;
664678
rx-delay = <1>;
665-
nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>,
666-
<NRF_FUN_SPIS_SCK>;
679+
nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>;
667680
};
668681

669682
uart120: uart@8e6000 {
@@ -690,8 +703,7 @@
690703
#size-cells = <0>;
691704
rx-delay-supported;
692705
rx-delay = <1>;
693-
nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>,
694-
<NRF_FUN_SPIS_SCK>;
706+
nordic,clockpin-enable = <NRF_FUN_SPIM_SCK>;
695707
};
696708

697709
cpuppr_vpr: vpr@908000 {

modules/hal_nordic/nrfx/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ config NRFX_SPIS30
643643

644644
config NRFX_SPIS120
645645
bool "SPIS120 driver instance"
646-
depends on $(dt_nodelabel_exists,spi120)
646+
depends on $(dt_nodelabel_exists,spis120)
647647
select NRFX_SPIS
648648

649649
config NRFX_SPIS130

soc/nordic/common/Kconfig.peripherals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ config HAS_HW_NRF_SPIS30
340340
def_bool $(dt_nodelabel_enabled_with_compat,spi30,$(DT_COMPAT_NORDIC_NRF_SPIS))
341341

342342
config HAS_HW_NRF_SPIS120
343-
def_bool $(dt_nodelabel_enabled_with_compat,spi120,$(DT_COMPAT_NORDIC_NRF_SPIS))
343+
def_bool $(dt_nodelabel_enabled_with_compat,spis120,$(DT_COMPAT_NORDIC_NRF_SPIS))
344344

345345
config HAS_HW_NRF_SPIS130
346346
def_bool $(dt_nodelabel_enabled_with_compat,spi130,$(DT_COMPAT_NORDIC_NRF_SPIS))

soc/nordic/validate_base_addresses.c

Lines changed: 1 addition & 0 deletions
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)