diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-10 08:52:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-10 08:52:41 -0700 |
| commit | ed36b437d9b16b073f53f3a61550df0e2e987b52 (patch) | |
| tree | cd757f9f9c05b8ce15dedc8a822142f953a28e85 | |
| parent | 86c019597cd4e0fc90dfa9ebba9282b2d122c187 (diff) | |
| parent | b6c08bcddb2af9ea6d1846bcd36a35371e249003 (diff) | |
| download | linux-ed36b437d9b16b073f53f3a61550df0e2e987b52.tar.gz linux-ed36b437d9b16b073f53f3a61550df0e2e987b52.tar.bz2 linux-ed36b437d9b16b073f53f3a61550df0e2e987b52.zip | |
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
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 183083ead1da..afceb58f76cb 100644 --- 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 index 16afb9ca19bb..876791d20ed5 100644 --- 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); |