Skip to content

Commit c85e149

Browse files
committed
Merge tag 'i3c/for-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux
Pull i3c updates from Alexandre Belloni: "This cycle, there are new features for the Designware controller and fixes for the other IPs: - dw: optional apb clock and power management support, IBI handling fixes - mipi-i3c-hci: IBI handling fixes - svc: a few fixes" * tag 'i3c/for-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux: dt-bindings: i3c: add header for generic I3C flags i3c: master: svc: Fix error code in svc_i3c_master_do_daa_locked() i3c: master: Enhance i3c_bus_type visibility for device searching & event monitoring i3c: dw: Add power management support i3c: dw: Add some functions for reusability i3c: dw: Save timing registers and other values i3c: master: svc: Improve DAA STOP handle code logic i3c: dw: Add optional apb clock i3c: dw: Use new *_enabled clk API dt-bindings: i3c: dw: Add apb clock binding i3c: master: svc: Convert comma to semicolon i3c: mipi-i3c-hci: Round IBI data chunk size to HW supported value i3c: mipi-i3c-hci: Error out instead on BUG_ON() in IBI DMA setup i3c: mipi-i3c-hci: Set IBI Status and Data Ring base addresses i3c: mipi-i3c-hci: Switch to lower_32_bits()/upper_32_bits() helpers i3c: dw: Remove ibi_capable property i3c: dw: Fix IBI intr programming i3c: dw: Fix clearing queue thld i3c: mipi-i3c-hci: Fix number of DAT/DCT entries for HCI versions < 1.1 i3c: master: svc: resend target address when get NACK
2 parents 1fcaa5d + 24168c5 commit c85e149

File tree

13 files changed

+431
-143
lines changed

13 files changed

+431
-143
lines changed

Documentation/devicetree/bindings/i3c/i3c.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ patternProperties:
9191
- const: 0
9292
- description: |
9393
Shall encode the I3C LVR (Legacy Virtual Register):
94+
See include/dt-bindings/i3c/i3c.h
9495
bit[31:8]: unused/ignored
9596
bit[7:5]: I2C device index. Possible values:
9697
* 0: I2C device has a 50 ns spike filter
@@ -153,6 +154,8 @@ additionalProperties: true
153154

154155
examples:
155156
- |
157+
#include <dt-bindings/i3c/i3c.h>
158+
156159
i3c@d040000 {
157160
compatible = "cdns,i3c-master";
158161
clocks = <&coreclock>, <&i3csysclock>;
@@ -166,7 +169,7 @@ examples:
166169
/* I2C device. */
167170
eeprom@57 {
168171
compatible = "atmel,24c01";
169-
reg = <0x57 0x0 0x10>;
172+
reg = <0x57 0x0 (I2C_FM | I2C_FILTER)>;
170173
pagesize = <0x8>;
171174
};
172175

Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,16 @@ properties:
2020
maxItems: 1
2121

2222
clocks:
23-
maxItems: 1
23+
minItems: 1
24+
items:
25+
- description: Core clock
26+
- description: APB clock
27+
28+
clock-names:
29+
minItems: 1
30+
items:
31+
- const: core
32+
- const: apb
2433

2534
interrupts:
2635
maxItems: 1

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10655,6 +10655,7 @@ F: Documentation/ABI/testing/sysfs-bus-i3c
1065510655
F: Documentation/devicetree/bindings/i3c/
1065610656
F: Documentation/driver-api/i3c
1065710657
F: drivers/i3c/
10658+
F: include/dt-bindings/i3c/
1065810659
F: include/linux/i3c/
1065910660

1066010661
IBM Operation Panel Input Driver

drivers/i3c/internals.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
#include <linux/i3c/master.h>
1212

13-
extern const struct bus_type i3c_bus_type;
14-
1513
void i3c_bus_normaluse_lock(struct i3c_bus *bus);
1614
void i3c_bus_normaluse_unlock(struct i3c_bus *bus);
1715

drivers/i3c/master.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ const struct bus_type i3c_bus_type = {
342342
.probe = i3c_device_probe,
343343
.remove = i3c_device_remove,
344344
};
345+
EXPORT_SYMBOL_GPL(i3c_bus_type);
345346

346347
static enum i3c_addr_slot_status
347348
i3c_bus_get_addr_slot_status(struct i3c_bus *bus, u16 addr)

drivers/i3c/master/ast2600-i3c-master.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ static int ast2600_i3c_probe(struct platform_device *pdev)
156156
i3c->sda_pullup);
157157

158158
i3c->dw.platform_ops = &ast2600_i3c_ops;
159-
i3c->dw.ibi_capable = true;
160159
return dw_i3c_common_probe(&i3c->dw, pdev);
161160
}
162161

0 commit comments

Comments
 (0)