Skip to content

Commit ed8d845

Browse files
committed
Merge tag 'i2c-for-6.8-rc1-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c updates from Wolfram Sang: "This removes the currently unused CLASS_DDC support (controllers set the flag, but there is no client to use it). Also, CLASS_SPD support gets simplified to prepare removal in the future. Class based instantiation is not recommended these days anyhow. Furthermore, I2C core now creates a debugfs directory per I2C adapter. Current bus driver users were converted to use it. Finally, quite some driver updates. Standing out are patches for the wmt-driver which is refactored to support more variants. This is the rebased pull request where a large series for the designware driver was dropped" * tag 'i2c-for-6.8-rc1-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits) MAINTAINERS: use proper email for my I2C work i2c: stm32f7: add support for stm32mp25 soc i2c: stm32f7: perform I2C_ISR read once at beginning of event isr dt-bindings: i2c: document st,stm32mp25-i2c compatible i2c: stm32f7: simplify status messages in case of errors i2c: stm32f7: perform most of irq job in threaded handler i2c: stm32f7: use dev_err_probe upon calls of devm_request_irq i2c: i801: Add lis3lv02d for Dell XPS 15 7590 i2c: i801: Add lis3lv02d for Dell Precision 3540 i2c: wmt: Reduce redundant: REG_CR setting i2c: wmt: Reduce redundant: function parameter i2c: wmt: Reduce redundant: clock mode setting i2c: wmt: Reduce redundant: wait event complete i2c: wmt: Reduce redundant: bus busy check i2c: mux: reg: Remove class-based device auto-detection support i2c: make i2c_bus_type const dt-bindings: at24: add ROHM BR24G04 eeprom: at24: use of_match_ptr() i2c: cpm: Remove linux,i2c-index conversion from be32 i2c: imx: Make SDA actually optional for bus recovering ...
2 parents 378de6d + 4503538 commit ed8d845

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+396
-445
lines changed

Documentation/devicetree/bindings/eeprom/at24.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ properties:
123123
- enum:
124124
- onnn,cat24c04
125125
- onnn,cat24c05
126+
- rohm,br24g04
126127
- const: atmel,24c04
127128
- items:
128129
- const: renesas,r1ex24016

Documentation/devicetree/bindings/i2c/st,stm32-i2c.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ allOf:
1919
- st,stm32f7-i2c
2020
- st,stm32mp13-i2c
2121
- st,stm32mp15-i2c
22+
- st,stm32mp25-i2c
2223
then:
2324
properties:
2425
i2c-scl-rising-time-ns:
@@ -41,13 +42,38 @@ allOf:
4142
clock-frequency:
4243
enum: [100000, 400000]
4344

45+
- if:
46+
properties:
47+
compatible:
48+
contains:
49+
enum:
50+
- st,stm32f4-i2c
51+
- st,stm32f7-i2c
52+
- st,stm32mp13-i2c
53+
- st,stm32mp15-i2c
54+
then:
55+
properties:
56+
interrupts:
57+
minItems: 2
58+
59+
interrupt-names:
60+
minItems: 2
61+
else:
62+
properties:
63+
interrupts:
64+
maxItems: 1
65+
66+
interrupt-names:
67+
maxItems: 1
68+
4469
properties:
4570
compatible:
4671
enum:
4772
- st,stm32f4-i2c
4873
- st,stm32f7-i2c
4974
- st,stm32mp13-i2c
5075
- st,stm32mp15-i2c
76+
- st,stm32mp25-i2c
5177

5278
reg:
5379
maxItems: 1
@@ -56,11 +82,13 @@ properties:
5682
items:
5783
- description: interrupt ID for I2C event
5884
- description: interrupt ID for I2C error
85+
minItems: 1
5986

6087
interrupt-names:
6188
items:
6289
- const: event
6390
- const: error
91+
minItems: 1
6492

6593
resets:
6694
maxItems: 1

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10061,7 +10061,7 @@ F: Documentation/i2c/busses/i2c-parport.rst
1006110061
F: drivers/i2c/busses/i2c-parport.c
1006210062

1006310063
I2C SUBSYSTEM
10064-
M: Wolfram Sang <wsa@kernel.org>
10064+
M: Wolfram Sang <wsa[email protected]>
1006510065
1006610066
S: Maintained
1006710067
W: https://i2c.wiki.kernel.org/

drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ struct amdgpu_i2c_chan *amdgpu_i2c_create(struct drm_device *dev,
175175

176176
i2c->rec = *rec;
177177
i2c->adapter.owner = THIS_MODULE;
178-
i2c->adapter.class = I2C_CLASS_DDC;
179178
i2c->adapter.dev.parent = dev->dev;
180179
i2c->dev = dev;
181180
i2c_set_adapdata(&i2c->adapter, i2c);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7615,7 +7615,6 @@ create_i2c(struct ddc_service *ddc_service,
76157615
if (!i2c)
76167616
return NULL;
76177617
i2c->base.owner = THIS_MODULE;
7618-
i2c->base.class = I2C_CLASS_DDC;
76197618
i2c->base.dev.parent = &adev->pdev->dev;
76207619
i2c->base.algo = &amdgpu_dm_i2c_algo;
76217620
snprintf(i2c->base.name, sizeof(i2c->base.name), "AMDGPU DM i2c hw bus %d", link_index);

drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,6 @@ static int aldebaran_i2c_control_init(struct smu_context *smu)
15301530
smu_i2c->port = 0;
15311531
mutex_init(&smu_i2c->mutex);
15321532
control->owner = THIS_MODULE;
1533-
control->class = I2C_CLASS_SPD;
15341533
control->dev.parent = &adev->pdev->dev;
15351534
control->algo = &aldebaran_i2c_algo;
15361535
snprintf(control->name, sizeof(control->name), "AMDGPU SMU 0");

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2696,7 +2696,6 @@ static int smu_v13_0_0_i2c_control_init(struct smu_context *smu)
26962696
smu_i2c->port = i;
26972697
mutex_init(&smu_i2c->mutex);
26982698
control->owner = THIS_MODULE;
2699-
control->class = I2C_CLASS_SPD;
27002699
control->dev.parent = &adev->pdev->dev;
27012700
control->algo = &smu_v13_0_0_i2c_algo;
27022701
snprintf(control->name, sizeof(control->name), "AMDGPU SMU %d", i);

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,6 @@ static int smu_v13_0_6_i2c_control_init(struct smu_context *smu)
19361936
smu_i2c->port = i;
19371937
mutex_init(&smu_i2c->mutex);
19381938
control->owner = THIS_MODULE;
1939-
control->class = I2C_CLASS_SPD;
19401939
control->dev.parent = &adev->pdev->dev;
19411940
control->algo = &smu_v13_0_6_i2c_algo;
19421941
snprintf(control->name, sizeof(control->name), "AMDGPU SMU %d", i);

drivers/gpu/drm/ast/ast_i2c.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev)
120120
return NULL;
121121

122122
i2c->adapter.owner = THIS_MODULE;
123-
i2c->adapter.class = I2C_CLASS_DDC;
124123
i2c->adapter.dev.parent = dev->dev;
125124
i2c->dev = dev;
126125
i2c_set_adapdata(&i2c->adapter, i2c);

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,6 @@ static struct i2c_adapter *dw_hdmi_i2c_adapter(struct dw_hdmi *hdmi)
515515
init_completion(&i2c->cmp);
516516

517517
adap = &i2c->adap;
518-
adap->class = I2C_CLASS_DDC;
519518
adap->owner = THIS_MODULE;
520519
adap->dev.parent = hdmi->dev;
521520
adap->algo = &dw_hdmi_algorithm;

0 commit comments

Comments
 (0)