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 | 5d12ed4bea4343ca3adbe3c23c8d149485de5010 (patch) | |
| tree | bd9b58b7871976b5c757f7a7b1028b28ddacd6ed /Documentation | |
| parent | profiling: Remove create_prof_cpu_mask(). (diff) | |
| parent | i2c: smbus: fix NULL function pointer dereference (diff) | |
| download | linux-5d12ed4bea4343ca3adbe3c23c8d149485de5010.tar.gz linux-5d12ed4bea4343ca3adbe3c23c8d149485de5010.tar.bz2 linux-5d12ed4bea4343ca3adbe3c23c8d149485de5010.zip | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/eeprom/at24.yaml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/eeprom/at24.yaml b/Documentation/devicetree/bindings/eeprom/at24.yaml index 1812ef31d5f1..3c36cd0510de 100644 --- a/Documentation/devicetree/bindings/eeprom/at24.yaml +++ b/Documentation/devicetree/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. |