Commit 51a0c8d0 authored by Virupax Sadashivpetimath's avatar Virupax Sadashivpetimath Committed by Wolfram Sang
Browse files

i2c-nomadik: Add 10-bit addressing support 



Signed-off-by: default avatarVirupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>
Signed-off-by: default avatarSrinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent 419408ed

drivers/i2c/busses/i2c-nomadik.c

+29 −17
Original line number Diff line number Diff line
@@ -276,14 +276,31 @@ static int init_hw(struct nmk_i2c_dev *dev) 
/**

 * load_i2c_mcr_reg() - load the MCR register

 * @dev: private data of controller

 * @flags: message flags

 */

static u32 load_i2c_mcr_reg(struct nmk_i2c_dev *dev)

static u32 load_i2c_mcr_reg(struct nmk_i2c_dev *dev, u16 flags)

{

	u32 mcr = 0;

	unsigned short slave_adr_3msb_bits;



	mcr |= GEN_MASK(dev->cli.slave_adr, I2C_MCR_A7, 1);



	if (unlikely(flags & I2C_M_TEN)) {

		/* 10-bit address transaction */

		mcr |= GEN_MASK(2, I2C_MCR_AM, 12);

		/*

		 * Get the top 3 bits.

		 * EA10 represents extended address in MCR. This includes

		 * the extension (MSB bits) of the 7 bit address loaded

		 * in A7

		 */

		slave_adr_3msb_bits = (dev->cli.slave_adr >> 7) & 0x7;



		mcr |= GEN_MASK(slave_adr_3msb_bits, I2C_MCR_EA10, 8);

	} else {

		/* 7-bit address transaction */

		mcr |= GEN_MASK(1, I2C_MCR_AM, 12);

	mcr |= GEN_MASK(dev->cli.slave_adr, I2C_MCR_A7, 1);

	}



	/* start byte procedure not applied */

	mcr |= GEN_MASK(0, I2C_MCR_SB, 11);
@@ -381,19 +398,20 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev) 
/**

 * read_i2c() - Read from I2C client device

 * @dev: private data of I2C Driver

 * @flags: message flags

 *

 * This function reads from i2c client device when controller is in

 * master mode. There is a completion timeout. If there is no transfer

 * before timeout error is returned.

 */

static int read_i2c(struct nmk_i2c_dev *dev)

static int read_i2c(struct nmk_i2c_dev *dev, u16 flags)

{

	u32 status = 0;

	u32 mcr;

	u32 irq_mask = 0;

	int timeout;



	mcr = load_i2c_mcr_reg(dev);

	mcr = load_i2c_mcr_reg(dev, flags);

	writel(mcr, dev->virtbase + I2C_MCR);



	/* load the current CR value */
@@ -459,17 +477,18 @@ static void fill_tx_fifo(struct nmk_i2c_dev *dev, int no_bytes) 
/**

 * write_i2c() - Write data to I2C client.

 * @dev: private data of I2C Driver

 * @flags: message flags

 *

 * This function writes data to I2C client

 */

static int write_i2c(struct nmk_i2c_dev *dev)

static int write_i2c(struct nmk_i2c_dev *dev, u16 flags)

{

	u32 status = 0;

	u32 mcr;

	u32 irq_mask = 0;

	int timeout;



	mcr = load_i2c_mcr_reg(dev);

	mcr = load_i2c_mcr_reg(dev, flags);



	writel(mcr, dev->virtbase + I2C_MCR);
@@ -538,11 +557,11 @@ static int nmk_i2c_xfer_one(struct nmk_i2c_dev *dev, u16 flags) 
	if (flags & I2C_M_RD) {

		/* read operation */

		dev->cli.operation = I2C_READ;

		status = read_i2c(dev);

		status = read_i2c(dev, flags);

	} else {

		/* write operation */

		dev->cli.operation = I2C_WRITE;

		status = write_i2c(dev);

		status = write_i2c(dev, flags);

	}



	if (status || (dev->result)) {
@@ -644,13 +663,6 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap, 
		setup_i2c_controller(dev);



		for (i = 0; i < num_msgs; i++) {

			if (unlikely(msgs[i].flags & I2C_M_TEN)) {

				dev_err(&dev->adev->dev,

					"10 bit addressing not supported\n");



				status = -EINVAL;

				goto out;

			}

			dev->cli.slave_adr	= msgs[i].addr;

			dev->cli.buffer		= msgs[i].buf;

			dev->cli.count		= msgs[i].len;
@@ -891,7 +903,7 @@ static const struct dev_pm_ops nmk_i2c_pm = { 


static unsigned int nmk_i2c_functionality(struct i2c_adapter *adap)

{

	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;

	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;

}



static const struct i2c_algorithm nmk_i2c_algo = {