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

Merge tag 'i2c-for-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:

 - omap: use correct function to read from device tree

 - MAINTAINERS: remove Seth from ISMT maintainership

* tag 'i2c-for-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  MAINTAINERS: Remove entry for Seth Heasley
  i2c: omap: fix deprecated of_property_read_bool() use
parents 86c01959 b6c08bcd

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -11237,7 +11237,6 @@ S: Maintained 
F:	drivers/i2c/busses/i2c-cht-wc.c









I2C/SMBUS ISMT DRIVER









M:	Seth Heasley <seth.heasley@intel.com>









M:	Neil Horman <nhorman@tuxdriver.com>









L:	linux-i2c@vger.kernel.org









F:	Documentation/i2c/busses/i2c-ismt.rst
































drivers/i2c/busses/i2c-omap.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1454,7 +1454,7 @@ omap_i2c_probe(struct platform_device *pdev)







				       (1000 * omap->speed / 8);









	}



















	if (of_property_read_bool(node, "mux-states")) {









	if (of_property_present(node, "mux-states")) {









		struct mux_state *mux_state;



















		mux_state = devm_mux_state_get(&pdev->dev, NULL);