Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8d950ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i3c/for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux 

Pull i3c updates from Boris Brezillon:

 - Add a /* fall-through */ comment in the dw-i3c-master driver

 - Update the I3C entries in MAINTAINERS to add an IRC chan

* tag 'i3c/for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
  i3c: master: dw-i3c-master: mark expected switch fall-through
  MAINTAINERS: Add an IRC channel for the I3C subsystem
parents 811c16a2 988bb4a1

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7176,6 +7176,7 @@ F: drivers/i2c/i2c-stub.c 
I3C SUBSYSTEM

M:	Boris Brezillon <bbrezillon@kernel.org>

L:	linux-i3c@lists.infradead.org

C:	irc://chat.freenode.net/linux-i3c

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git

S:	Maintained

F:	Documentation/ABI/testing/sysfs-bus-i3c

drivers/i3c/master/dw-i3c-master.c

+1 −0
Original line number Diff line number Diff line
@@ -602,6 +602,7 @@ static int dw_i3c_master_bus_init(struct i3c_master_controller *m) 
		ret = dw_i2c_clk_cfg(master);

		if (ret)

			return ret;

		/* fall through */

	case I3C_BUS_MODE_PURE:

		ret = dw_i3c_clk_cfg(master);

		if (ret)