Commit 0823baef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "Two bugfixes for the I2C subsystem"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: mpc: Poll for MCF
  misc: eeprom: at24: Always append device id even if label property is set.
parents bca1d4de 4a8ac5e4

drivers/i2c/busses/i2c-mpc.c

+2 −2
Original line number Diff line number Diff line
@@ -635,8 +635,8 @@ static irqreturn_t mpc_i2c_isr(int irq, void *dev_id) 


	status = readb(i2c->base + MPC_I2C_SR);

	if (status & CSR_MIF) {

		/* Read again to allow register to stabilise */

		status = readb(i2c->base + MPC_I2C_SR);

		/* Wait up to 100us for transfer to properly complete */

		readb_poll_timeout(i2c->base + MPC_I2C_SR, status, !(status & CSR_MCF), 0, 100);

		writeb(0, i2c->base + MPC_I2C_SR);

		mpc_i2c_do_intr(i2c, status);

		return IRQ_HANDLED;

drivers/misc/eeprom/at24.c

+7 −10
Original line number Diff line number Diff line
@@ -714,23 +714,20 @@ static int at24_probe(struct i2c_client *client) 
	}



	/*

	 * If the 'label' property is not present for the AT24 EEPROM,

	 * then nvmem_config.id is initialised to NVMEM_DEVID_AUTO,

	 * and this will append the 'devid' to the name of the NVMEM

	 * device. This is purely legacy and the AT24 driver has always

	 * defaulted to this. However, if the 'label' property is

	 * present then this means that the name is specified by the

	 * firmware and this name should be used verbatim and so it is

	 * not necessary to append the 'devid'.

	 * We initialize nvmem_config.id to NVMEM_DEVID_AUTO even if the

	 * label property is set as some platform can have multiple eeproms

	 * with same label and we can not register each of those with same

	 * label. Failing to register those eeproms trigger cascade failure

	 * on such platform.

	 */

	nvmem_config.id = NVMEM_DEVID_AUTO;



	if (device_property_present(dev, "label")) {

		nvmem_config.id = NVMEM_DEVID_NONE;

		err = device_property_read_string(dev, "label",

						  &nvmem_config.name);

		if (err)

			return err;

	} else {

		nvmem_config.id = NVMEM_DEVID_AUTO;

		nvmem_config.name = dev_name(dev);

	}