xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'at24-4.17-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-4.17

Browse Source 
"three new special cases for device tree compatible strings"
This commit is contained in:
Wolfram Sang
2018-03-24 13:39:18 +01:00
parent eb49778c8c 84e10623c0
commit 0b884c22c5
746 changed files with 7606 additions and 4903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
case STAT_TXDATA_NAK:
case STAT_BUS_ERROR:
return -EIO;
case STAT_TXADDR_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 */
/* Status values */
#define STAT_ERROR 0x00
#define STAT_BUS_ERROR 0x00
#define STAT_START 0x08
#define STAT_REP_START 0x10
#define STAT_TXADDR_ACK 0x18