Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58bdf601 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 20f14172 7c424679

Documentation/devicetree/bindings/eeprom/at24.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ Required properties: 


                "catalyst",

                "microchip",

                "nxp",

                "ramtron",

                "renesas",

                "nxp",

                "st",



                Some vendors use different model names for chips which are just

drivers/i2c/busses/i2c-octeon-core.c

+1 −0
Original line number Diff line number Diff line
@@ -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:

drivers/i2c/busses/i2c-octeon-core.h

+1 −1
Original line number Diff line number Diff line
@@ -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