hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2018-03-03 14:55:20 -08:00
parent 20f14172cb 7c4246797b
commit 58bdf601c2
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/eeprom/at24.txt
View File

@ -38,9 +38,9 @@ Required properties:
"catalyst", "catalyst",
"microchip", "microchip",
"nxp",
"ramtron", "ramtron",
"renesas", "renesas",
"nxp",
"st", "st",
Some vendors use different model names for chips which are just Some vendors use different model names for chips which are just

1
drivers/i2c/busses/i2c-octeon-core.c
View File

@ -233,6 +233,7 @@ static int octeon_i2c_check_status(struct octeon_i2c *i2c, int final_read)
return -EOPNOTSUPP; return -EOPNOTSUPP;
case STAT_TXDATA_NAK: case STAT_TXDATA_NAK:
case STAT_BUS_ERROR:
return -EIO; return -EIO;
case STAT_TXADDR_NAK: case STAT_TXADDR_NAK:
case STAT_RXADDR_NAK: case STAT_RXADDR_NAK:

2
drivers/i2c/busses/i2c-octeon-core.h
View File

@ -43,7 +43,7 @@
#define TWSI_CTL_AAK 0x04 /* Assert ACK */ #define TWSI_CTL_AAK 0x04 /* Assert ACK */
/* Status values */ /* Status values */
#define STAT_ERROR 0x00 #define STAT_BUS_ERROR 0x00
#define STAT_START 0x08 #define STAT_START 0x08
#define STAT_REP_START 0x10 #define STAT_REP_START 0x10
#define STAT_TXADDR_ACK 0x18 #define STAT_TXADDR_ACK 0x18