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

Commit 1b7e7e6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux 

* 'for-2639-rc7/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
  i2c-eg20t: include slab.h for memory allocations
  i2c-ocores: Fix pointer type mismatch error
  i2c-omap: Program I2C_WE on OMAP4 to enable i2c wakeup
parents fbf855d7 6dbc2f35

drivers/i2c/busses/i2c-eg20t.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/pci.h>

#include <linux/mutex.h>

#include <linux/ktime.h>

#include <linux/slab.h>



#define PCH_EVENT_SET	0	/* I2C Interrupt Event Set Status */

#define PCH_EVENT_NONE	1	/* I2C Interrupt Event Clear Status */

drivers/i2c/busses/i2c-ocores.c

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static struct i2c_adapter ocores_adapter = { 
static int ocores_i2c_of_probe(struct platform_device* pdev,

				struct ocores_i2c* i2c)

{

	__be32* val;

	const __be32* val;



	val = of_get_property(pdev->dev.of_node, "regstep", NULL);

	if (!val) {

drivers/i2c/busses/i2c-omap.c

+1 −3
Original line number Diff line number Diff line
@@ -378,9 +378,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev) 
			 * REVISIT: Some wkup sources might not be needed.

			 */

			dev->westate = OMAP_I2C_WE_ALL;

			if (dev->rev < OMAP_I2C_REV_ON_4430)

				omap_i2c_write_reg(dev, OMAP_I2C_WE_REG,

								dev->westate);

			omap_i2c_write_reg(dev, OMAP_I2C_WE_REG, dev->westate);

		}

	}

	omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);