Skip to content

Commit 7e96ca5

Browse files
galakMaureenHelm
galak
authored and
MaureenHelm
committed
i2c: Remove non DTS Kconfig params
All drivers utilize DTS now so we can remove the Kconfig params related to !HAS_DTS_I2C. Signed-off-by: Kumar Gala <[email protected]>
1 parent 9599c2d commit 7e96ca5

File tree

2 files changed

+6
-181
lines changed

2 files changed

+6
-181
lines changed

‎boards/xtensa/esp32/esp32_defconfig

-5
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,3 @@ CONFIG_I2C_0=y
3535
CONFIG_I2C_1=y
3636
CONFIG_I2C_2=n
3737
CONFIG_I2C_3=n
38-
39-
# IRQ priorities are fixed on Xtensa, but Kconfig will ask for these
40-
# if not set.
41-
CONFIG_I2C_0_IRQ_PRI=1
42-
CONFIG_I2C_1_IRQ_PRI=1

‎drivers/i2c/Kconfig

+6-176
Original file line numberDiff line numberDiff line change
@@ -45,203 +45,27 @@ source "subsys/logging/Kconfig.template.log_config"
4545
config I2C_0
4646
bool "Enable I2C Port 0"
4747

48-
config I2C_0_NAME
49-
string "Port 0 device name"
50-
depends on I2C_0 && !HAS_DTS_I2C
51-
default "I2C_0"
52-
53-
config I2C_0_DEFAULT_CFG
54-
hex "Port 0 default configuration"
55-
depends on I2C_0 && !HAS_DTS_I2C
56-
default 0x0
57-
help
58-
Allows the I2C port to be brought up with a default configuration.
59-
This is useful to set if other drivers depend upon using the I2C bus
60-
before the application has a chance to custom configure the port.
61-
Setting this value does not prohibit the application from customizing
62-
the values later. Refer to include/i2c.h file for proper values.
63-
64-
config I2C_0_IRQ_PRI
65-
int "Port 0 interrupt priority"
66-
depends on I2C_0 && !HAS_DTS_I2C
67-
help
68-
IRQ priority.
69-
7048
config I2C_1
7149
bool "Enable I2C Port 1"
7250

73-
config I2C_1_NAME
74-
string "Port 1 device name"
75-
default "I2C_1"
76-
depends on I2C_1 && !HAS_DTS_I2C
77-
78-
config I2C_1_DEFAULT_CFG
79-
hex "Port 1 default configuration"
80-
depends on I2C_1 && !HAS_DTS_I2C
81-
default 0x0
82-
help
83-
Allows the I2C port to be brought up with a default configuration.
84-
This is useful to set if other drivers depend upon using the I2C bus
85-
before the application has a chance to custom configure the port.
86-
Setting this value does not prohibit the application from customizing
87-
the values later. Refer to include/i2c.h file for proper values.
88-
89-
config I2C_1_IRQ_PRI
90-
int "Port 1 interrupt priority"
91-
depends on I2C_1 && !HAS_DTS_I2C
92-
help
93-
IRQ priority.
94-
9551
config I2C_2
9652
bool "Enable I2C Port 2"
9753

98-
config I2C_2_NAME
99-
string "Port 2 device name"
100-
default "I2C_2"
101-
depends on I2C_2 && !HAS_DTS_I2C
102-
103-
config I2C_2_DEFAULT_CFG
104-
hex "Port 2 default configuration"
105-
depends on I2C_2 && !HAS_DTS_I2C
106-
default 0x0
107-
help
108-
Allows the I2C port to be brought up with a default configuration.
109-
This is useful to set if other drivers depend upon using the I2C bus
110-
before the application has a chance to custom configure the port.
111-
Setting this value does not prohibit the application from customizing
112-
the values later. Refer to include/i2c.h file for proper values.
113-
114-
config I2C_2_IRQ_PRI
115-
int "Port 2 interrupt priority"
116-
depends on I2C_2 && !HAS_DTS_I2C
117-
help
118-
IRQ priority.
119-
12054
config I2C_3
12155
bool "Enable I2C Port 3"
12256

123-
config I2C_3_NAME
124-
string "Port 3 device name"
125-
depends on I2C_3 && !HAS_DTS_I2C
126-
default "I2C_3"
127-
128-
config I2C_3_DEFAULT_CFG
129-
hex "Port 3 default configuration"
130-
depends on I2C_3 && !HAS_DTS_I2C
131-
default 0x0
132-
help
133-
Allows the I2C port to be brought up with a default configuration.
134-
This is useful to set if other drivers depend upon using the I2C bus
135-
before the application has a chance to custom configure the port.
136-
Setting this value does not prohibit the application from customizing
137-
the values later. Refer to include/i2c.h file for proper values.
138-
139-
config I2C_3_IRQ_PRI
140-
int "Port 3 interrupt priority"
141-
depends on I2C_3 && !HAS_DTS_I2C
142-
help
143-
IRQ priority.
144-
14557
config I2C_4
14658
bool "Enable I2C Port 4"
14759

148-
config I2C_4_NAME
149-
string "Port 4 device name"
150-
depends on I2C_4 && !HAS_DTS_I2C
151-
default "I2C_4"
152-
153-
config I2C_4_DEFAULT_CFG
154-
hex "Port 4 default configuration"
155-
depends on I2C_4 && !HAS_DTS_I2C
156-
default 0x0
157-
help
158-
Allows the I2C port to be brought up with a default configuration.
159-
This is useful to set if other drivers depend upon using the I2C bus
160-
before the application has a chance to custom configure the port.
161-
Setting this value does not prohibit the application from customizing
162-
the values later. Refer to include/i2c.h file for proper values.
163-
164-
config I2C_4_IRQ_PRI
165-
int "Port 4 interrupt priority"
166-
depends on I2C_4 && !HAS_DTS_I2C
167-
help
168-
IRQ priority.
169-
17060
config I2C_5
17161
bool "Enable I2C Port 5"
17262

173-
config I2C_5_NAME
174-
string "Port 5 device name"
175-
depends on I2C_5 && !HAS_DTS_I2C
176-
default "I2C_5"
177-
178-
config I2C_5_DEFAULT_CFG
179-
hex "Port 5 default configuration"
180-
depends on I2C_5 && !HAS_DTS_I2C
181-
default 0x0
182-
help
183-
Allows the I2C port to be brought up with a default configuration.
184-
This is useful to set if other drivers depend upon using the I2C bus
185-
before the application has a chance to custom configure the port.
186-
Setting this value does not prohibit the application from customizing
187-
the values later. Refer to include/i2c.h file for proper values.
188-
189-
config I2C_5_IRQ_PRI
190-
int "Port 5 interrupt priority"
191-
depends on I2C_5 && !HAS_DTS_I2C
192-
help
193-
IRQ priority.
194-
19563
config I2C_6
19664
bool "Enable I2C Port 6"
19765

198-
config I2C_6_NAME
199-
string "Port 6 device name"
200-
depends on I2C_6 && !HAS_DTS_I2C
201-
default "I2C_6"
202-
203-
config I2C_6_DEFAULT_CFG
204-
hex "Port 6 default configuration"
205-
depends on I2C_6 && !HAS_DTS_I2C
206-
default 0x0
207-
help
208-
Allows the I2C port to be brought up with a default configuration.
209-
This is useful to set if other drivers depend upon using the I2C bus
210-
before the application has a chance to custom configure the port.
211-
Setting this value does not prohibit the application from customizing
212-
the values later. Refer to include/i2c.h file for proper values.
213-
214-
config I2C_6_IRQ_PRI
215-
int "Port 6 interrupt priority"
216-
depends on I2C_6 && !HAS_DTS_I2C
217-
help
218-
IRQ priority.
219-
22066
config I2C_7
22167
bool "Enable I2C Port 7"
22268

223-
config I2C_7_NAME
224-
string "Port 7 device name"
225-
depends on I2C_7 && !HAS_DTS_I2C
226-
default "I2C_7"
227-
228-
config I2C_7_DEFAULT_CFG
229-
hex "Port 7 default configuration"
230-
depends on I2C_7 && !HAS_DTS_I2C
231-
default 0x0
232-
help
233-
Allows the I2C port to be brought up with a default configuration.
234-
This is useful to set if other drivers depend upon using the I2C bus
235-
before the application has a chance to custom configure the port.
236-
Setting this value does not prohibit the application from customizing
237-
the values later. Refer to include/i2c.h file for proper values.
238-
239-
config I2C_7_IRQ_PRI
240-
int "Port 7 interrupt priority"
241-
depends on I2C_7 && !HAS_DTS_I2C
242-
help
243-
IRQ priority.
244-
24569
config I2C_GECKO
24670
bool "Gecko I2C driver"
24771
depends on HAS_SILABS_GECKO
@@ -303,6 +127,12 @@ config I2C_NIOS2
303127
help
304128
Enable the Nios-II I2C driver.
305129

130+
config I2C_0_IRQ_PRI
131+
int "Port 0 interrupt priority"
132+
depends on I2C_NIOS2
133+
help
134+
IRQ priority.
135+
306136
config I2C_RV32M1_LPI2C
307137
bool "RV32M1 LPI2C driver"
308138
depends on HAS_RV32M1_LPI2C && CLOCK_CONTROL

0 commit comments

Comments
 (0)