Skip to content

Commit 9730aca

Browse files
adamkondraciukadamkondraciuk
committed
drivers: i2c: i2c_nrfx_twis: use standard instantiation
Removed Kconfig symbols for each TWIS instance which are no longer needed. Signed-off-by: Adam Kondraciuk <[email protected]>
1 parent f7d70e4 commit 9730aca

File tree

4 files changed

+1
-215
lines changed

4 files changed

+1
-215
lines changed

‎drivers/i2c/Kconfig.nrfx‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,7 @@ config I2C_NRFX_TWIS
3838
depends on DT_HAS_NORDIC_NRF_TWIS_ENABLED
3939
depends on I2C_TARGET
4040
depends on I2C_TARGET_BUFFER_MODE
41-
select NRFX_TWIS0 if HAS_HW_NRF_TWIS0
42-
select NRFX_TWIS1 if HAS_HW_NRF_TWIS1
43-
select NRFX_TWIS2 if HAS_HW_NRF_TWIS2
44-
select NRFX_TWIS3 if HAS_HW_NRF_TWIS3
45-
select NRFX_TWIS20 if HAS_HW_NRF_TWIS20
46-
select NRFX_TWIS21 if HAS_HW_NRF_TWIS21
47-
select NRFX_TWIS22 if HAS_HW_NRF_TWIS22
48-
select NRFX_TWIS23 if HAS_HW_NRF_TWIS23
49-
select NRFX_TWIS24 if HAS_HW_NRF_TWIS24
50-
select NRFX_TWIS30 if HAS_HW_NRF_TWIS30
51-
select NRFX_TWIS130 if HAS_HW_NRF_TWIS130
52-
select NRFX_TWIS131 if HAS_HW_NRF_TWIS131
53-
select NRFX_TWIS133 if HAS_HW_NRF_TWIS133
54-
select NRFX_TWIS134 if HAS_HW_NRF_TWIS134
55-
select NRFX_TWIS135 if HAS_HW_NRF_TWIS135
56-
select NRFX_TWIS136 if HAS_HW_NRF_TWIS136
57-
select NRFX_TWIS137 if HAS_HW_NRF_TWIS137
41+
select NRFX_TWIS
5842

5943
if I2C_NRFX_TWIS
6044

‎modules/hal_nordic/nrfx/Kconfig‎

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -910,96 +910,6 @@ config NRFX_TWIM
910910
config NRFX_TWIS
911911
bool
912912

913-
config NRFX_TWIS0
914-
bool "TWIS0 driver instance"
915-
depends on $(dt_nodelabel_exists,i2c0) && !SOC_SERIES_NRF51X
916-
select NRFX_TWIS
917-
918-
config NRFX_TWIS1
919-
bool "TWIS1 driver instance"
920-
depends on $(dt_nodelabel_exists,i2c1) && !SOC_SERIES_NRF51X
921-
select NRFX_TWIS
922-
923-
config NRFX_TWIS2
924-
bool "TWIS2 driver instance"
925-
depends on $(dt_nodelabel_exists,i2c2)
926-
select NRFX_TWIS
927-
928-
config NRFX_TWIS3
929-
bool "TWIS3 driver instance"
930-
depends on $(dt_nodelabel_exists,i2c3)
931-
select NRFX_TWIS
932-
933-
config NRFX_TWIS20
934-
bool "TWIS20 driver instance"
935-
depends on $(dt_nodelabel_exists,i2c20)
936-
select NRFX_TWIS
937-
938-
config NRFX_TWIS21
939-
bool "TWIS21 driver instance"
940-
depends on $(dt_nodelabel_exists,i2c21)
941-
select NRFX_TWIS
942-
943-
config NRFX_TWIS22
944-
bool "TWIS22 driver instance"
945-
depends on $(dt_nodelabel_exists,i2c22)
946-
select NRFX_TWIS
947-
948-
config NRFX_TWIS23
949-
bool "TWIS23 driver instance"
950-
depends on $(dt_nodelabel_exists,i2c23)
951-
select NRFX_TWIS
952-
953-
config NRFX_TWIS24
954-
bool "TWIS24 driver instance"
955-
depends on $(dt_nodelabel_exists,i2c24)
956-
select NRFX_TWIS
957-
958-
config NRFX_TWIS30
959-
bool "TWIS30 driver instance"
960-
depends on $(dt_nodelabel_exists,i2c30)
961-
select NRFX_TWIS
962-
963-
config NRFX_TWIS130
964-
bool "TWIS130 driver instance"
965-
depends on $(dt_nodelabel_exists,i2c130)
966-
select NRFX_TWIS
967-
968-
config NRFX_TWIS131
969-
bool "TWIS131 driver instance"
970-
depends on $(dt_nodelabel_exists,i2c131)
971-
select NRFX_TWIS
972-
973-
config NRFX_TWIS132
974-
bool "TWIS132 driver instance"
975-
depends on $(dt_nodelabel_exists,i2c132)
976-
select NRFX_TWIS
977-
978-
config NRFX_TWIS133
979-
bool "TWIS133 driver instance"
980-
depends on $(dt_nodelabel_exists,i2c133)
981-
select NRFX_TWIS
982-
983-
config NRFX_TWIS134
984-
bool "TWIS134 driver instance"
985-
depends on $(dt_nodelabel_exists,i2c134)
986-
select NRFX_TWIS
987-
988-
config NRFX_TWIS135
989-
bool "TWIS135 driver instance"
990-
depends on $(dt_nodelabel_exists,i2c135)
991-
select NRFX_TWIS
992-
993-
config NRFX_TWIS136
994-
bool "TWIS136 driver instance"
995-
depends on $(dt_nodelabel_exists,i2c136)
996-
select NRFX_TWIS
997-
998-
config NRFX_TWIS137
999-
bool "TWIS137 driver instance"
1000-
depends on $(dt_nodelabel_exists,i2c137)
1001-
select NRFX_TWIS
1002-
1003913
config NRFX_UART
1004914
bool
1005915

‎modules/hal_nordic/nrfx/nrfx_kconfig.h‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -773,60 +773,6 @@
773773
#ifdef CONFIG_NRFX_TWIS_LOG
774774
#define NRFX_TWIS_CONFIG_LOG_ENABLED 1
775775
#endif
776-
#ifdef CONFIG_NRFX_TWIS0
777-
#define NRFX_TWIS0_ENABLED 1
778-
#endif
779-
#ifdef CONFIG_NRFX_TWIS1
780-
#define NRFX_TWIS1_ENABLED 1
781-
#endif
782-
#ifdef CONFIG_NRFX_TWIS2
783-
#define NRFX_TWIS2_ENABLED 1
784-
#endif
785-
#ifdef CONFIG_NRFX_TWIS3
786-
#define NRFX_TWIS3_ENABLED 1
787-
#endif
788-
#ifdef CONFIG_NRFX_TWIS20
789-
#define NRFX_TWIS20_ENABLED 1
790-
#endif
791-
#ifdef CONFIG_NRFX_TWIS21
792-
#define NRFX_TWIS21_ENABLED 1
793-
#endif
794-
#ifdef CONFIG_NRFX_TWIS22
795-
#define NRFX_TWIS22_ENABLED 1
796-
#endif
797-
#ifdef CONFIG_NRFX_TWIS23
798-
#define NRFX_TWIS23_ENABLED 1
799-
#endif
800-
#ifdef CONFIG_NRFX_TWIS24
801-
#define NRFX_TWIS24_ENABLED 1
802-
#endif
803-
#ifdef CONFIG_NRFX_TWIS30
804-
#define NRFX_TWIS30_ENABLED 1
805-
#endif
806-
#ifdef CONFIG_NRFX_TWIS130
807-
#define NRFX_TWIS130_ENABLED 1
808-
#endif
809-
#ifdef CONFIG_NRFX_TWIS131
810-
#define NRFX_TWIS131_ENABLED 1
811-
#endif
812-
#ifdef CONFIG_NRFX_TWIS132
813-
#define NRFX_TWIS132_ENABLED 1
814-
#endif
815-
#ifdef CONFIG_NRFX_TWIS133
816-
#define NRFX_TWIS133_ENABLED 1
817-
#endif
818-
#ifdef CONFIG_NRFX_TWIS134
819-
#define NRFX_TWIS134_ENABLED 1
820-
#endif
821-
#ifdef CONFIG_NRFX_TWIS135
822-
#define NRFX_TWIS135_ENABLED 1
823-
#endif
824-
#ifdef CONFIG_NRFX_TWIS136
825-
#define NRFX_TWIS136_ENABLED 1
826-
#endif
827-
#ifdef CONFIG_NRFX_TWIS137
828-
#define NRFX_TWIS137_ENABLED 1
829-
#endif
830776

831777
#ifdef CONFIG_NRFX_UART
832778
#define NRFX_UART_ENABLED 1

‎soc/nordic/common/Kconfig.peripherals‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -501,60 +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_TWIS0
505-
def_bool $(dt_nodelabel_enabled_with_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIS))
506-
507-
config HAS_HW_NRF_TWIS1
508-
def_bool $(dt_nodelabel_enabled_with_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWIS))
509-
510-
config HAS_HW_NRF_TWIS2
511-
def_bool $(dt_nodelabel_enabled_with_compat,i2c2,$(DT_COMPAT_NORDIC_NRF_TWIS))
512-
513-
config HAS_HW_NRF_TWIS3
514-
def_bool $(dt_nodelabel_enabled_with_compat,i2c3,$(DT_COMPAT_NORDIC_NRF_TWIS))
515-
516-
config HAS_HW_NRF_TWIS20
517-
def_bool $(dt_nodelabel_enabled_with_compat,i2c20,$(DT_COMPAT_NORDIC_NRF_TWIS))
518-
519-
config HAS_HW_NRF_TWIS21
520-
def_bool $(dt_nodelabel_enabled_with_compat,i2c21,$(DT_COMPAT_NORDIC_NRF_TWIS))
521-
522-
config HAS_HW_NRF_TWIS22
523-
def_bool $(dt_nodelabel_enabled_with_compat,i2c22,$(DT_COMPAT_NORDIC_NRF_TWIS))
524-
525-
config HAS_HW_NRF_TWIS23
526-
def_bool $(dt_nodelabel_enabled_with_compat,i2c23,$(DT_COMPAT_NORDIC_NRF_TWIS))
527-
528-
config HAS_HW_NRF_TWIS24
529-
def_bool $(dt_nodelabel_enabled_with_compat,i2c24,$(DT_COMPAT_NORDIC_NRF_TWIS))
530-
531-
config HAS_HW_NRF_TWIS30
532-
def_bool $(dt_nodelabel_enabled_with_compat,i2c30,$(DT_COMPAT_NORDIC_NRF_TWIS))
533-
534-
config HAS_HW_NRF_TWIS130
535-
def_bool $(dt_nodelabel_enabled_with_compat,i2c130,$(DT_COMPAT_NORDIC_NRF_TWIS))
536-
537-
config HAS_HW_NRF_TWIS131
538-
def_bool $(dt_nodelabel_enabled_with_compat,i2c131,$(DT_COMPAT_NORDIC_NRF_TWIS))
539-
540-
config HAS_HW_NRF_TWIS132
541-
def_bool $(dt_nodelabel_enabled_with_compat,i2c132,$(DT_COMPAT_NORDIC_NRF_TWIS))
542-
543-
config HAS_HW_NRF_TWIS133
544-
def_bool $(dt_nodelabel_enabled_with_compat,i2c133,$(DT_COMPAT_NORDIC_NRF_TWIS))
545-
546-
config HAS_HW_NRF_TWIS134
547-
def_bool $(dt_nodelabel_enabled_with_compat,i2c134,$(DT_COMPAT_NORDIC_NRF_TWIS))
548-
549-
config HAS_HW_NRF_TWIS135
550-
def_bool $(dt_nodelabel_enabled_with_compat,i2c135,$(DT_COMPAT_NORDIC_NRF_TWIS))
551-
552-
config HAS_HW_NRF_TWIS136
553-
def_bool $(dt_nodelabel_enabled_with_compat,i2c136,$(DT_COMPAT_NORDIC_NRF_TWIS))
554-
555-
config HAS_HW_NRF_TWIS137
556-
def_bool $(dt_nodelabel_enabled_with_compat,i2c137,$(DT_COMPAT_NORDIC_NRF_TWIS))
557-
558504
config HAS_HW_NRF_UART0
559505
def_bool $(dt_nodelabel_enabled_with_compat,uart0,$(DT_COMPAT_NORDIC_NRF_UART))
560506

0 commit comments

Comments
 (0)