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

Commit 62aee937 authored by Hans de Goede's avatar Hans de Goede Committed by Daniel Vetter
Browse files

i2c: designware-baytrail: Pass dw_i2c_dev into helper functions 



Pass dw_i2c_dev into the helper functions, this is a preparation patch
for the punit semaphore fixes done in the other patches in this set.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Tested-by: default avatarTakashi Iwai <tiwai@suse.de>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170210102802.20898-5-hdegoede@redhat.com
parent 86524e54

drivers/i2c/busses/i2c-designware-baytrail.c

+8 −8
Original line number Diff line number Diff line
@@ -28,14 +28,14 @@ 


static unsigned long acquired;



static int get_sem(struct device *dev, u32 *sem)

static int get_sem(struct dw_i2c_dev *dev, u32 *sem)

{

	u32 data;

	int ret;



	ret = iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ, PUNIT_SEMAPHORE, &data);

	if (ret) {

		dev_err(dev, "iosf failed to read punit semaphore\n");

		dev_err(dev->dev, "iosf failed to read punit semaphore\n");

		return ret;

	}
@@ -44,18 +44,18 @@ static int get_sem(struct device *dev, u32 *sem) 
	return 0;

}



static void reset_semaphore(struct device *dev)

static void reset_semaphore(struct dw_i2c_dev *dev)

{

	u32 data;



	if (iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ, PUNIT_SEMAPHORE, &data)) {

		dev_err(dev, "iosf failed to reset punit semaphore during read\n");

		dev_err(dev->dev, "iosf failed to reset punit semaphore during read\n");

		return;

	}



	data &= ~PUNIT_SEMAPHORE_BIT;

	if (iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_REG_WRITE, PUNIT_SEMAPHORE, data))

		dev_err(dev, "iosf failed to reset punit semaphore during write\n");

		dev_err(dev->dev, "iosf failed to reset punit semaphore during write\n");

}



static int baytrail_i2c_acquire(struct dw_i2c_dev *dev)
@@ -83,7 +83,7 @@ static int baytrail_i2c_acquire(struct dw_i2c_dev *dev) 
	start = jiffies;

	end = start + msecs_to_jiffies(SEMAPHORE_TIMEOUT);

	do {

		ret = get_sem(dev->dev, &sem);

		ret = get_sem(dev, &sem);

		if (!ret && sem) {

			acquired = jiffies;

			dev_dbg(dev->dev, "punit semaphore acquired after %ums\n",
@@ -95,7 +95,7 @@ static int baytrail_i2c_acquire(struct dw_i2c_dev *dev) 
	} while (time_before(jiffies, end));



	dev_err(dev->dev, "punit semaphore timed out, resetting\n");

	reset_semaphore(dev->dev);

	reset_semaphore(dev);



	ret = iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ, PUNIT_SEMAPHORE, &sem);

	if (ret)
@@ -116,7 +116,7 @@ static void baytrail_i2c_release(struct dw_i2c_dev *dev) 
	if (!dev->acquire_lock)

		return;



	reset_semaphore(dev->dev);

	reset_semaphore(dev);

	dev_dbg(dev->dev, "punit semaphore held for %ums\n",

		jiffies_to_msecs(jiffies - acquired));

}