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

torvalds · torvalds · commit ed36b437d9b1 · 2025-05-10T08:52:41.000-07:00
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
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -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
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
@@ -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);

-Original file line number
+Diff line change
 F:	drivers/i2c/busses/i2c-cht-wc.c
 I2C/SMBUS ISMT DRIVER
 -M:	Seth Heasley <[email protected]>
 M:	Neil Horman <[email protected]>
 L:	[email protected]
 F:	Documentation/i2c/busses/i2c-ismt.rst
Original file line number	Diff line number	Diff line change
`@@ -1454,7 +1454,7 @@ omap_i2c_probe(struct platform_device *pdev)`
`1454`	`1454`	`(1000 * omap->speed / 8);`
`1455`	`1455`	`}`
`1456`	`1456`
`1457`		`- if (of_property_read_bool(node, "mux-states")) {`
	`1457`	`+ if (of_property_present(node, "mux-states")) {`
`1458`	`1458`	`struct mux_state *mux_state;`
`1459`	`1459`
`1460`	`1460`	`mux_state = devm_mux_state_get(&pdev->dev, NULL);`