diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-27 11:24:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-27 11:24:53 -0700 |
| commit | 17c632b491220a28c9617c15932eeeda07f82bf1 (patch) | |
| tree | 8ce640de859365e61b87fa4a2e0e868457f48759 | |
| parent | a1bf8545a7b4462a58c66f99276b3db5bd4c3dcf (diff) | |
| parent | a4916498fb4a4e55fc3a9ef741cbc13c8d7fdf67 (diff) | |
| download | devicetree-rebasing-17c632b491220a28c9617c15932eeeda07f82bf1.tar.gz | |
Merge tag 'i2c-for-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Fix a race condition in the at24 eeprom handler, a NULL pointer
exception in the I2C core for controllers only using target modes,
drop a MAINTAINERS entry, and fix an incorrect DT binding for at24"
* tag 'i2c-for-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: smbus: fix NULL function pointer dereference
MAINTAINERS: Drop entry for PCA9541 bus master selector
eeprom: at24: fix memory corruption race condition
dt-bindings: eeprom: at24: Fix ST M24C64-D compatible schema
[ upstream commit: 5d12ed4bea4343ca3adbe3c23c8d149485de5010 ]
| -rw-r--r-- | Bindings/eeprom/at24.yaml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Bindings/eeprom/at24.yaml b/Bindings/eeprom/at24.yaml index 1812ef31d5f1e9..3c36cd0510de83 100644 --- a/Bindings/eeprom/at24.yaml +++ b/Bindings/eeprom/at24.yaml @@ -69,14 +69,10 @@ properties: - items: pattern: c32$ - items: - pattern: c32d-wl$ - - items: pattern: cs32$ - items: pattern: c64$ - items: - pattern: c64d-wl$ - - items: pattern: cs64$ - items: pattern: c128$ @@ -136,6 +132,7 @@ properties: - renesas,r1ex24128 - samsung,s524ad0xd1 - const: atmel,24c128 + - pattern: '^atmel,24c(32|64)d-wl$' # Actual vendor is st label: description: Descriptive name of the EEPROM. |