tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
"A driver fix and a documentation fix (which makes dependency handling
for the next cycle easier)"

* 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: octeon: Prevent error message on bus error
dt-bindings: at24: sort manufacturers alphabetically

Linus Torvalds 58bdf601 20f14172

+3 -2
+1 -1
Documentation/devicetree/bindings/eeprom/at24.txt
··· 38 38 39 39 "catalyst", 40 40 "microchip", 41 + "nxp", 41 42 "ramtron", 42 43 "renesas", 43 - "nxp", 44 44 "st", 45 45 46 46 Some vendors use different model names for chips which are just
+1
drivers/i2c/busses/i2c-octeon-core.c
··· 233 233 return -EOPNOTSUPP; 234 234 235 235 case STAT_TXDATA_NAK: 236 + case STAT_BUS_ERROR: 236 237 return -EIO; 237 238 case STAT_TXADDR_NAK: 238 239 case STAT_RXADDR_NAK:
+1 -1
drivers/i2c/busses/i2c-octeon-core.h
··· 43 43 #define TWSI_CTL_AAK 0x04 /* Assert ACK */ 44 44 45 45 /* Status values */ 46 - #define STAT_ERROR 0x00 46 + #define STAT_BUS_ERROR 0x00 47 47 #define STAT_START 0x08 48 48 #define STAT_REP_START 0x10 49 49 #define STAT_TXADDR_ACK 0x18