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

Commit 084b7c83 authored by Ben Dooks's avatar Ben Dooks
Browse files

Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638

parents 7f42f9fe 747fcc91

drivers/i2c/busses/i2c-iop3xx.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -409,7 +409,7 @@ iop3xx_i2c_remove(struct platform_device *pdev) 
		IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE);

		IOP3XX_ICR_RXFULL_IE | IOP3XX_ICR_TXEMPTY_IE);

	__raw_writel(cr, adapter_data->ioaddr + CR_OFFSET);

	__raw_writel(cr, adapter_data->ioaddr + CR_OFFSET);





	iounmap((void __iomem*)adapter_data->ioaddr);

	iounmap(adapter_data->ioaddr);

	release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);

	release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);

	kfree(adapter_data);

	kfree(adapter_data);

	kfree(padapter);

	kfree(padapter);
@@ -453,7 +453,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) 
	/* set the adapter enumeration # */

	/* set the adapter enumeration # */

	adapter_data->id = i2c_id++;

	adapter_data->id = i2c_id++;





	adapter_data->ioaddr = (u32)ioremap(res->start, IOP3XX_I2C_IO_SIZE);

	adapter_data->ioaddr = ioremap(res->start, IOP3XX_I2C_IO_SIZE);

	if (!adapter_data->ioaddr) {

	if (!adapter_data->ioaddr) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto release_region;

		goto release_region;
@@ -498,7 +498,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) 
	return 0;

	return 0;





unmap:

unmap:

	iounmap((void __iomem*)adapter_data->ioaddr);

	iounmap(adapter_data->ioaddr);





release_region:

release_region:

	release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);

	release_mem_region(res->start, IOP3XX_I2C_IO_SIZE);

drivers/i2c/busses/i2c-iop3xx.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ 
#define	IOP3XX_I2C_IO_SIZE	0x18

#define	IOP3XX_I2C_IO_SIZE	0x18





struct i2c_algo_iop3xx_data {

struct i2c_algo_iop3xx_data {

	u32 ioaddr;

	void __iomem *ioaddr;

	wait_queue_head_t waitq;

	wait_queue_head_t waitq;

	spinlock_t lock;

	spinlock_t lock;

	u32 SR_enabled, SR_received;

	u32 SR_enabled, SR_received;