diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-25 21:39:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-25 21:39:23 -0800 |
| commit | a11b696975f257ad2410cbb26f288cc52724f81a (patch) | |
| tree | 71569fefddefd0e0c5b37f26cd1043fd5ac7c39d | |
| parent | ae2dc032773da914911f4e2a6075f31d1cbc9ca0 (diff) | |
| parent | ae24f2b6f828f4ae37d0f0fd3be4e7744b6aab13 (diff) | |
Merge tag 'i3c/for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux
Pull i3c updates from Boris Brezillon:
"Minor fixes and MAINTAINERS updates"
* tag 'i3c/for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
MAINTAINERS: add myself as maintainer of Cadence I3C master controller driver
MAINTAINERS: Mark linux-i3c mailing list moderated
i3c: Spelling s/dicovered/discovered/
i3c: master: use i3c_dev_get_master()
| -rw-r--r-- | MAINTAINERS | 8 | ||||
| -rw-r--r-- | drivers/i3c/master.c | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8576b2f873aa..8f075b866aaf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7781,7 +7781,7 @@ F: drivers/i2c/i2c-stub.c I3C SUBSYSTEM M: Boris Brezillon <bbrezillon@kernel.org> -L: linux-i3c@lists.infradead.org +L: linux-i3c@lists.infradead.org (moderated for non-subscribers) C: irc://chat.freenode.net/linux-i3c T: git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git S: Maintained @@ -7797,6 +7797,12 @@ S: Maintained F: Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt F: drivers/i3c/master/dw* +I3C DRIVER FOR CADENCE I3C MASTER IP +M: Przemysław Gaj <pgaj@cadence.com> +S: Maintained +F: Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt +F: drivers/i3c/master/i3c-master-cdns.c + IA64 (Itanium) PLATFORM M: Tony Luck <tony.luck@intel.com> M: Fenghua Yu <fenghua.yu@intel.com> diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 5c051dba32a5..043691656245 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -1763,7 +1763,7 @@ static void i3c_master_bus_cleanup(struct i3c_master_controller *master) static struct i3c_dev_desc * i3c_master_search_i3c_dev_duplicate(struct i3c_dev_desc *refdev) { - struct i3c_master_controller *master = refdev->common.master; + struct i3c_master_controller *master = i3c_dev_get_master(refdev); struct i3c_dev_desc *i3cdev; i3c_bus_for_each_i3cdev(&master->bus, i3cdev) { @@ -2493,7 +2493,7 @@ int i3c_master_register(struct i3c_master_controller *master, /* * We're done initializing the bus and the controller, we can now - * register I3C devices dicovered during the initial DAA. + * register I3C devices discovered during the initial DAA. */ master->init_done = true; i3c_bus_normaluse_lock(&master->bus); |