Skip to content

Commit 307eca4

Browse files
dnltzkartben
dnltz
authored and
kartben
committed
drivers: i2c: Add zephyr-keep-sorted defines
The previous re-organization has the zephyr-keep-sorted defines missing. Add them for the I2C drivers and targets. Also moved lines to fix out-of-order violations. Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
1 parent 0a941da commit 307eca4

File tree

4 files changed

+45
-52
lines changed

4 files changed

+45
-52
lines changed

‎drivers/i2c/CMakeLists.txt

Lines changed: 37 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,23 @@ zephyr_library()
66

77
zephyr_library_sources(i2c_common.c)
88

9+
# zephyr-keep-sorted-start
910
zephyr_library_sources_ifdef(CONFIG_GPIO_I2C_SWITCH gpio_i2c_switch.c)
1011
zephyr_library_sources_ifdef(CONFIG_I2C_BITBANG i2c_bitbang.c)
1112
zephyr_library_sources_ifdef(CONFIG_I2C_EMUL i2c_emul.c)
1213
zephyr_library_sources_ifdef(CONFIG_I2C_GPIO i2c_gpio.c)
13-
zephyr_library_sources_ifdef(CONFIG_I2C_SHELL i2c_shell.c)
1414
zephyr_library_sources_ifdef(CONFIG_I2C_RTIO
1515
i2c_rtio.c
1616
i2c_rtio_default.c
17-
)
17+
)
18+
zephyr_library_sources_ifdef(CONFIG_I2C_SHELL i2c_shell.c)
1819
zephyr_library_sources_ifdef(CONFIG_I2C_TEST i2c_test.c)
1920
zephyr_library_sources_ifdef(CONFIG_USERSPACE i2c_handlers.c)
20-
add_subdirectory_ifdef(CONFIG_I2C_TARGET target)
21+
# zephyr-keep-sorted-stop
2122

23+
add_subdirectory_ifdef(CONFIG_I2C_TARGET target)
2224

25+
# zephyr-keep-sorted-start
2326
zephyr_library_sources_ifdef(CONFIG_I2C_AMBIQ i2c_ambiq.c)
2427
zephyr_library_sources_ifdef(CONFIG_I2C_ANDES_ATCIIC100 i2c_andes_atciic100.c)
2528
zephyr_library_sources_ifdef(CONFIG_I2C_CC13XX_CC26XX i2c_cc13xx_cc26xx.c)
@@ -30,62 +33,27 @@ zephyr_library_sources_ifdef(CONFIG_I2C_ESP32 i2c_esp32.c)
3033
zephyr_library_sources_ifdef(CONFIG_I2C_GD32 i2c_gd32.c)
3134
zephyr_library_sources_ifdef(CONFIG_I2C_GECKO i2c_gecko.c)
3235
zephyr_library_sources_ifdef(CONFIG_I2C_IMX i2c_imx.c)
33-
zephyr_library_sources_ifdef(CONFIG_I2C_IPROC i2c_bcm_iproc.c)
3436
zephyr_library_sources_ifdef(CONFIG_I2C_INFINEON_CAT1 i2c_ifx_cat1.c)
3537
zephyr_library_sources_ifdef(CONFIG_I2C_INFINEON_XMC4 i2c_ifx_xmc4.c)
36-
zephyr_library_sources_ifdef(CONFIG_I2C_ITE_IT8XXX2 i2c_ite_it8xxx2.c)
38+
zephyr_library_sources_ifdef(CONFIG_I2C_IPROC i2c_bcm_iproc.c)
3739
zephyr_library_sources_ifdef(CONFIG_I2C_ITE_ENHANCE i2c_ite_enhance.c)
40+
zephyr_library_sources_ifdef(CONFIG_I2C_ITE_IT8XXX2 i2c_ite_it8xxx2.c)
3841
zephyr_library_sources_ifdef(CONFIG_I2C_LITEX i2c_litex.c)
3942
zephyr_library_sources_ifdef(CONFIG_I2C_LPC11U6X i2c_lpc11u6x.c)
4043
zephyr_library_sources_ifdef(CONFIG_I2C_MCHP_MSS i2c_mchp_mss.c)
4144
zephyr_library_sources_ifdef(CONFIG_I2C_MCUX i2c_mcux.c)
4245
zephyr_library_sources_ifdef(CONFIG_I2C_MCUX_FLEXCOMM i2c_mcux_flexcomm.c)
43-
if(CONFIG_I2C_RTIO)
44-
zephyr_library_sources_ifdef(CONFIG_I2C_MCUX_LPI2C i2c_mcux_lpi2c_rtio.c)
45-
else()
46-
zephyr_library_sources_ifdef(CONFIG_I2C_MCUX_LPI2C i2c_mcux_lpi2c.c)
47-
endif()
4846
zephyr_library_sources_ifdef(CONFIG_I2C_NIOS2 i2c_nios2.c)
4947
zephyr_library_sources_ifdef(CONFIG_I2C_NPCX i2c_npcx_controller.c)
5048
zephyr_library_sources_ifdef(CONFIG_I2C_NPCX i2c_npcx_port.c)
51-
if(CONFIG_I2C_RTIO)
52-
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWI
53-
i2c_nrfx_twi_rtio.c
54-
i2c_nrfx_twi_common.c
55-
)
56-
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM
57-
i2c_nrfx_twim_rtio.c
58-
i2c_nrfx_twim_common.c
59-
)
60-
else()
61-
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWI
62-
i2c_nrfx_twi.c
63-
i2c_nrfx_twi_common.c
64-
)
65-
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM
66-
i2c_nrfx_twim.c
67-
i2c_nrfx_twim_common.c
68-
)
69-
endif()
7049
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIS i2c_nrfx_twis.c)
7150
zephyr_library_sources_ifdef(CONFIG_I2C_NUMAKER i2c_numaker.c)
51+
zephyr_library_sources_ifdef(CONFIG_I2C_RCAR i2c_rcar.c)
52+
zephyr_library_sources_ifdef(CONFIG_I2C_RENESAS_RA_IIC i2c_renesas_ra_iic.c)
53+
zephyr_library_sources_ifdef(CONFIG_I2C_RV32M1_LPI2C i2c_rv32m1_lpi2c.c)
54+
zephyr_library_sources_ifdef(CONFIG_I2C_SAM0 i2c_sam0.c)
7255
zephyr_library_sources_ifdef(CONFIG_I2C_SAM_TWI i2c_sam_twi.c)
73-
if(CONFIG_I2C_RTIO)
74-
zephyr_library_sources_ifdef(CONFIG_I2C_SAM_TWIHS
75-
i2c_sam_twihs_rtio.c
76-
)
77-
else()
78-
zephyr_library_sources_ifdef(CONFIG_I2C_SAM_TWIHS
79-
i2c_sam_twihs.c
80-
)
81-
endif()
82-
if(CONFIG_I2C_RTIO)
83-
zephyr_library_sources_ifdef(CONFIG_I2C_MAX32 i2c_max32_rtio.c)
84-
else()
85-
zephyr_library_sources_ifdef(CONFIG_I2C_MAX32 i2c_max32.c)
86-
endif()
8756
zephyr_library_sources_ifdef(CONFIG_I2C_SAM_TWIM i2c_sam4l_twim.c)
88-
zephyr_library_sources_ifdef(CONFIG_I2C_SAM0 i2c_sam0.c)
8957
zephyr_library_sources_ifdef(CONFIG_I2C_SBCON i2c_sbcon.c)
9058
zephyr_library_sources_ifdef(CONFIG_I2C_SC18IM704 i2c_sc18im704.c)
9159
zephyr_library_sources_ifdef(CONFIG_I2C_SEDI i2c_sedi.c)
@@ -94,16 +62,36 @@ zephyr_library_sources_ifdef(CONFIG_I2C_SMARTBOND i2c_smartbond.c)
9462
zephyr_library_sources_ifdef(CONFIG_I2C_STM32_V1
9563
i2c_ll_stm32_v1.c
9664
i2c_ll_stm32.c
97-
)
65+
)
9866
zephyr_library_sources_ifdef(CONFIG_I2C_STM32_V2
9967
i2c_ll_stm32_v2.c
10068
i2c_ll_stm32.c
101-
)
102-
zephyr_library_sources_ifdef(CONFIG_I2C_RENESAS_RA_IIC i2c_renesas_ra_iic.c)
103-
zephyr_library_sources_ifdef(CONFIG_I2C_RCAR i2c_rcar.c)
104-
zephyr_library_sources_ifdef(CONFIG_I2C_RV32M1_LPI2C i2c_rv32m1_lpi2c.c)
69+
)
10570
zephyr_library_sources_ifdef(CONFIG_I2C_TCA954X i2c_tca954x.c)
10671
zephyr_library_sources_ifdef(CONFIG_I2C_TELINK_B91 i2c_b91.c)
10772
zephyr_library_sources_ifdef(CONFIG_I2C_XEC i2c_mchp_xec.c)
10873
zephyr_library_sources_ifdef(CONFIG_I2C_XEC_V2 i2c_mchp_xec_v2.c)
10974
zephyr_library_sources_ifdef(CONFIG_I2C_XILINX_AXI i2c_xilinx_axi.c)
75+
# zephyr-keep-sorted-stop
76+
77+
if(CONFIG_I2C_RTIO)
78+
# zephyr-keep-sorted-start
79+
zephyr_library_sources_ifdef(CONFIG_I2C_MAX32 i2c_max32_rtio.c)
80+
zephyr_library_sources_ifdef(CONFIG_I2C_MCUX_LPI2C i2c_mcux_lpi2c_rtio.c)
81+
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWI i2c_nrfx_twi_common.c)
82+
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWI i2c_nrfx_twi_rtio.c)
83+
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM i2c_nrfx_twim_common.c)
84+
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM i2c_nrfx_twim_rtio.c)
85+
zephyr_library_sources_ifdef(CONFIG_I2C_SAM_TWIHS i2c_sam_twihs_rtio.c)
86+
# zephyr-keep-sorted-stop
87+
else()
88+
# zephyr-keep-sorted-start
89+
zephyr_library_sources_ifdef(CONFIG_I2C_MAX32 i2c_max32.c)
90+
zephyr_library_sources_ifdef(CONFIG_I2C_MCUX_LPI2C i2c_mcux_lpi2c.c)
91+
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWI i2c_nrfx_twi.c)
92+
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWI i2c_nrfx_twi_common.c)
93+
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM i2c_nrfx_twim.c)
94+
zephyr_library_sources_ifdef(CONFIG_I2C_NRFX_TWIM i2c_nrfx_twim_common.c)
95+
zephyr_library_sources_ifdef(CONFIG_I2C_SAM_TWIHS i2c_sam_twihs.c)
96+
# zephyr-keep-sorted-stop
97+
endif()

‎drivers/i2c/Kconfig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ endif # I2C_RTIO
117117
# Include these first so that any properties (e.g. defaults) below can be
118118
# overridden (by defining symbols in multiple locations)
119119
source "drivers/i2c/target/Kconfig"
120+
# zephyr-keep-sorted-start
120121
source "drivers/i2c/Kconfig.ambiq"
121122
source "drivers/i2c/Kconfig.andes_atciic100"
122123
source "drivers/i2c/Kconfig.b91"
@@ -127,10 +128,10 @@ source "drivers/i2c/Kconfig.ene"
127128
source "drivers/i2c/Kconfig.esp32"
128129
source "drivers/i2c/Kconfig.gd32"
129130
source "drivers/i2c/Kconfig.gpio"
131+
source "drivers/i2c/Kconfig.i2c_emul"
130132
source "drivers/i2c/Kconfig.ifx_cat1"
131133
source "drivers/i2c/Kconfig.ifx_xmc4"
132134
source "drivers/i2c/Kconfig.it8xxx2"
133-
source "drivers/i2c/Kconfig.i2c_emul"
134135
source "drivers/i2c/Kconfig.litex"
135136
source "drivers/i2c/Kconfig.lpc11u6x"
136137
source "drivers/i2c/Kconfig.max32"
@@ -139,8 +140,8 @@ source "drivers/i2c/Kconfig.mcux"
139140
source "drivers/i2c/Kconfig.npcx"
140141
source "drivers/i2c/Kconfig.nrfx"
141142
source "drivers/i2c/Kconfig.numaker"
142-
source "drivers/i2c/Kconfig.renesas_ra"
143143
source "drivers/i2c/Kconfig.rcar"
144+
source "drivers/i2c/Kconfig.renesas_ra"
144145
source "drivers/i2c/Kconfig.sam0"
145146
source "drivers/i2c/Kconfig.sam_twihs"
146147
source "drivers/i2c/Kconfig.sbcon"
@@ -149,11 +150,11 @@ source "drivers/i2c/Kconfig.sedi"
149150
source "drivers/i2c/Kconfig.sifive"
150151
source "drivers/i2c/Kconfig.smartbond"
151152
source "drivers/i2c/Kconfig.stm32"
152-
153153
source "drivers/i2c/Kconfig.tca954x"
154154
source "drivers/i2c/Kconfig.test"
155155
source "drivers/i2c/Kconfig.xec"
156156
source "drivers/i2c/Kconfig.xilinx_axi"
157+
# zephyr-keep-sorted-stop
157158

158159
config I2C_INIT_PRIORITY
159160
int "Init priority"

‎drivers/i2c/target/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3+
# zephyr-keep-sorted-start
34
zephyr_library_sources_ifdef(CONFIG_I2C_EEPROM_TARGET eeprom_target.c)
5+
# zephyr-keep-sorted-stop

‎drivers/i2c/target/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ config I2C_TARGET_BUFFER_MODE
2525
help
2626
This is an option to enable buffer mode.
2727

28+
# zephyr-keep-sorted-start
2829
source "drivers/i2c/target/Kconfig.eeprom"
30+
# zephyr-keep-sorted-stop
2931

3032
endif # I2C_TARGET

0 commit comments

Comments
 (0)