Skip to content

Commit a0bc884

Browse files
adamkondraciukadamkondraciuk
committed
drivers: i2c: i2c_nrfx_twim: use standard instantiation
Removed Kconfig symbols for each TWIM instance which are no longer needed. Signed-off-by: Adam Kondraciuk <[email protected]>
1 parent 8670bdf commit a0bc884

File tree

4 files changed

+1
-228
lines changed

4 files changed

+1
-228
lines changed

‎drivers/i2c/Kconfig.nrfx‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,7 @@ config I2C_NRFX_TWI
2323
config I2C_NRFX_TWIM
2424
def_bool y
2525
depends on DT_HAS_NORDIC_NRF_TWIM_ENABLED
26-
select NRFX_TWIM0 if HAS_HW_NRF_TWIM0
27-
select NRFX_TWIM1 if HAS_HW_NRF_TWIM1
28-
select NRFX_TWIM2 if HAS_HW_NRF_TWIM2
29-
select NRFX_TWIM3 if HAS_HW_NRF_TWIM3
30-
select NRFX_TWIM20 if HAS_HW_NRF_TWIM20
31-
select NRFX_TWIM21 if HAS_HW_NRF_TWIM21
32-
select NRFX_TWIM22 if HAS_HW_NRF_TWIM22
33-
select NRFX_TWIM23 if HAS_HW_NRF_TWIM23
34-
select NRFX_TWIM24 if HAS_HW_NRF_TWIM24
35-
select NRFX_TWIM30 if HAS_HW_NRF_TWIM30
36-
select NRFX_TWIM120 if HAS_HW_NRF_TWIM120
37-
select NRFX_TWIM130 if HAS_HW_NRF_TWIM130
38-
select NRFX_TWIM131 if HAS_HW_NRF_TWIM131
39-
select NRFX_TWIM132 if HAS_HW_NRF_TWIM132
40-
select NRFX_TWIM133 if HAS_HW_NRF_TWIM133
41-
select NRFX_TWIM134 if HAS_HW_NRF_TWIM134
42-
select NRFX_TWIM135 if HAS_HW_NRF_TWIM135
43-
select NRFX_TWIM136 if HAS_HW_NRF_TWIM136
44-
select NRFX_TWIM137 if HAS_HW_NRF_TWIM137
26+
select NRFX_TWIM
4527

4628
config I2C_NRFX_TRANSFER_TIMEOUT
4729
int "Transfer timeout [ms]"

‎modules/hal_nordic/nrfx/Kconfig‎

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -907,101 +907,6 @@ config NRFX_TWI1
907907
config NRFX_TWIM
908908
bool
909909

910-
config NRFX_TWIM0
911-
bool "TWIM0 driver instance"
912-
depends on $(dt_nodelabel_exists,i2c0) && !SOC_SERIES_NRF51X
913-
select NRFX_TWIM
914-
915-
config NRFX_TWIM1
916-
bool "TWIM1 driver instance"
917-
depends on $(dt_nodelabel_exists,i2c1) && !SOC_SERIES_NRF51X
918-
select NRFX_TWIM
919-
920-
config NRFX_TWIM2
921-
bool "TWIM2 driver instance"
922-
depends on $(dt_nodelabel_exists,i2c2)
923-
select NRFX_TWIM
924-
925-
config NRFX_TWIM3
926-
bool "TWIM3 driver instance"
927-
depends on $(dt_nodelabel_exists,i2c3)
928-
select NRFX_TWIM
929-
930-
config NRFX_TWIM20
931-
bool "TWIM20 driver instance"
932-
depends on $(dt_nodelabel_exists,i2c20)
933-
select NRFX_TWIM
934-
935-
config NRFX_TWIM21
936-
bool "TWIM21 driver instance"
937-
depends on $(dt_nodelabel_exists,i2c21)
938-
select NRFX_TWIM
939-
940-
config NRFX_TWIM22
941-
bool "TWIM22 driver instance"
942-
depends on $(dt_nodelabel_exists,i2c22)
943-
select NRFX_TWIM
944-
945-
config NRFX_TWIM23
946-
bool "TWIM23 driver instance"
947-
depends on $(dt_nodelabel_exists,i2c23)
948-
select NRFX_TWIM
949-
950-
config NRFX_TWIM24
951-
bool "TWIM24 driver instance"
952-
depends on $(dt_nodelabel_exists,i2c24)
953-
select NRFX_TWIM
954-
955-
config NRFX_TWIM30
956-
bool "TWIM30 driver instance"
957-
depends on $(dt_nodelabel_exists,i2c30)
958-
select NRFX_TWIM
959-
960-
config NRFX_TWIM120
961-
bool "TWIM120 driver instance"
962-
depends on $(dt_nodelabel_exists,i2c120)
963-
select NRFX_TWIM
964-
965-
config NRFX_TWIM130
966-
bool "TWIM130 driver instance"
967-
depends on $(dt_nodelabel_exists,i2c130)
968-
select NRFX_TWIM
969-
970-
config NRFX_TWIM131
971-
bool "TWIM131 driver instance"
972-
depends on $(dt_nodelabel_exists,i2c131)
973-
select NRFX_TWIM
974-
975-
config NRFX_TWIM132
976-
bool "TWIM132 driver instance"
977-
depends on $(dt_nodelabel_exists,i2c132)
978-
select NRFX_TWIM
979-
980-
config NRFX_TWIM133
981-
bool "TWIM133 driver instance"
982-
depends on $(dt_nodelabel_exists,i2c133)
983-
select NRFX_TWIM
984-
985-
config NRFX_TWIM134
986-
bool "TWIM134 driver instance"
987-
depends on $(dt_nodelabel_exists,i2c134)
988-
select NRFX_TWIM
989-
990-
config NRFX_TWIM135
991-
bool "TWIM135 driver instance"
992-
depends on $(dt_nodelabel_exists,i2c135)
993-
select NRFX_TWIM
994-
995-
config NRFX_TWIM136
996-
bool "TWIM136 driver instance"
997-
depends on $(dt_nodelabel_exists,i2c136)
998-
select NRFX_TWIM
999-
1000-
config NRFX_TWIM137
1001-
bool "TWIM137 driver instance"
1002-
depends on $(dt_nodelabel_exists,i2c137)
1003-
select NRFX_TWIM
1004-
1005910
config NRFX_TWIS
1006911
bool
1007912

‎modules/hal_nordic/nrfx/nrfx_kconfig.h‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -760,63 +760,6 @@
760760
#ifdef CONFIG_NRFX_TWIM_LOG
761761
#define NRFX_TWIM_CONFIG_LOG_ENABLED 1
762762
#endif
763-
#ifdef CONFIG_NRFX_TWIM0
764-
#define NRFX_TWIM0_ENABLED 1
765-
#endif
766-
#ifdef CONFIG_NRFX_TWIM1
767-
#define NRFX_TWIM1_ENABLED 1
768-
#endif
769-
#ifdef CONFIG_NRFX_TWIM2
770-
#define NRFX_TWIM2_ENABLED 1
771-
#endif
772-
#ifdef CONFIG_NRFX_TWIM3
773-
#define NRFX_TWIM3_ENABLED 1
774-
#endif
775-
#ifdef CONFIG_NRFX_TWIM20
776-
#define NRFX_TWIM20_ENABLED 1
777-
#endif
778-
#ifdef CONFIG_NRFX_TWIM21
779-
#define NRFX_TWIM21_ENABLED 1
780-
#endif
781-
#ifdef CONFIG_NRFX_TWIM22
782-
#define NRFX_TWIM22_ENABLED 1
783-
#endif
784-
#ifdef CONFIG_NRFX_TWIM23
785-
#define NRFX_TWIM23_ENABLED 1
786-
#endif
787-
#ifdef CONFIG_NRFX_TWIM24
788-
#define NRFX_TWIM24_ENABLED 1
789-
#endif
790-
#ifdef CONFIG_NRFX_TWIM30
791-
#define NRFX_TWIM30_ENABLED 1
792-
#endif
793-
#ifdef CONFIG_NRFX_TWIM120
794-
#define NRFX_TWIM120_ENABLED 1
795-
#endif
796-
#ifdef CONFIG_NRFX_TWIM130
797-
#define NRFX_TWIM130_ENABLED 1
798-
#endif
799-
#ifdef CONFIG_NRFX_TWIM131
800-
#define NRFX_TWIM131_ENABLED 1
801-
#endif
802-
#ifdef CONFIG_NRFX_TWIM132
803-
#define NRFX_TWIM132_ENABLED 1
804-
#endif
805-
#ifdef CONFIG_NRFX_TWIM133
806-
#define NRFX_TWIM133_ENABLED 1
807-
#endif
808-
#ifdef CONFIG_NRFX_TWIM134
809-
#define NRFX_TWIM134_ENABLED 1
810-
#endif
811-
#ifdef CONFIG_NRFX_TWIM135
812-
#define NRFX_TWIM135_ENABLED 1
813-
#endif
814-
#ifdef CONFIG_NRFX_TWIM136
815-
#define NRFX_TWIM136_ENABLED 1
816-
#endif
817-
#ifdef CONFIG_NRFX_TWIM137
818-
#define NRFX_TWIM137_ENABLED 1
819-
#endif
820763
#ifdef CONFIG_NRF52_ANOMALY_219_WORKAROUND
821764
#define NRF52_ERRATA_219_ENABLE_WORKAROUND 1
822765
#endif

‎soc/nordic/common/Kconfig.peripherals‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -501,63 +501,6 @@ config HAS_HW_NRF_TWI0
501501
config HAS_HW_NRF_TWI1
502502
def_bool $(dt_nodelabel_enabled_with_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWI))
503503

504-
config HAS_HW_NRF_TWIM0
505-
def_bool $(dt_nodelabel_enabled_with_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIM))
506-
507-
config HAS_HW_NRF_TWIM1
508-
def_bool $(dt_nodelabel_enabled_with_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWIM))
509-
510-
config HAS_HW_NRF_TWIM2
511-
def_bool $(dt_nodelabel_enabled_with_compat,i2c2,$(DT_COMPAT_NORDIC_NRF_TWIM))
512-
513-
config HAS_HW_NRF_TWIM3
514-
def_bool $(dt_nodelabel_enabled_with_compat,i2c3,$(DT_COMPAT_NORDIC_NRF_TWIM))
515-
516-
config HAS_HW_NRF_TWIM20
517-
def_bool $(dt_nodelabel_enabled_with_compat,i2c20,$(DT_COMPAT_NORDIC_NRF_TWIM))
518-
519-
config HAS_HW_NRF_TWIM21
520-
def_bool $(dt_nodelabel_enabled_with_compat,i2c21,$(DT_COMPAT_NORDIC_NRF_TWIM))
521-
522-
config HAS_HW_NRF_TWIM22
523-
def_bool $(dt_nodelabel_enabled_with_compat,i2c22,$(DT_COMPAT_NORDIC_NRF_TWIM))
524-
525-
config HAS_HW_NRF_TWIM23
526-
def_bool $(dt_nodelabel_enabled_with_compat,i2c23,$(DT_COMPAT_NORDIC_NRF_TWIM))
527-
528-
config HAS_HW_NRF_TWIM24
529-
def_bool $(dt_nodelabel_enabled_with_compat,i2c24,$(DT_COMPAT_NORDIC_NRF_TWIM))
530-
531-
config HAS_HW_NRF_TWIM30
532-
def_bool $(dt_nodelabel_enabled_with_compat,i2c30,$(DT_COMPAT_NORDIC_NRF_TWIM))
533-
534-
config HAS_HW_NRF_TWIM120
535-
def_bool $(dt_nodelabel_enabled_with_compat,i2c120,$(DT_COMPAT_NORDIC_NRF_TWIM))
536-
537-
config HAS_HW_NRF_TWIM130
538-
def_bool $(dt_nodelabel_enabled_with_compat,i2c130,$(DT_COMPAT_NORDIC_NRF_TWIM))
539-
540-
config HAS_HW_NRF_TWIM131
541-
def_bool $(dt_nodelabel_enabled_with_compat,i2c131,$(DT_COMPAT_NORDIC_NRF_TWIM))
542-
543-
config HAS_HW_NRF_TWIM132
544-
def_bool $(dt_nodelabel_enabled_with_compat,i2c132,$(DT_COMPAT_NORDIC_NRF_TWIM))
545-
546-
config HAS_HW_NRF_TWIM133
547-
def_bool $(dt_nodelabel_enabled_with_compat,i2c133,$(DT_COMPAT_NORDIC_NRF_TWIM))
548-
549-
config HAS_HW_NRF_TWIM134
550-
def_bool $(dt_nodelabel_enabled_with_compat,i2c134,$(DT_COMPAT_NORDIC_NRF_TWIM))
551-
552-
config HAS_HW_NRF_TWIM135
553-
def_bool $(dt_nodelabel_enabled_with_compat,i2c135,$(DT_COMPAT_NORDIC_NRF_TWIM))
554-
555-
config HAS_HW_NRF_TWIM136
556-
def_bool $(dt_nodelabel_enabled_with_compat,i2c136,$(DT_COMPAT_NORDIC_NRF_TWIM))
557-
558-
config HAS_HW_NRF_TWIM137
559-
def_bool $(dt_nodelabel_enabled_with_compat,i2c137,$(DT_COMPAT_NORDIC_NRF_TWIM))
560-
561504
config HAS_HW_NRF_TWIS0
562505
def_bool $(dt_nodelabel_enabled_with_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIS))
563506

0 commit comments

Comments
 (0)