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

Commit e34d6b4b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus/i2c-32-rc6' of git://git.fluff.org/bjdooks/linux 

* 'for-linus/i2c-32-rc6' of git://git.fluff.org/bjdooks/linux:
  i2c-eg20t: correct the driver init order of pch_i2c_probe()
  I2C: OMAP: fix FIFO usage for OMAP4
  i2c-s3c2410: Fix return code of s3c24xx_i2c_parse_dt_gpio
  i2c: i2c-s3c2410: Add a cpu_relax() to busy wait for bus idle
parents 497f16f2 0d5fb5ea

drivers/i2c/busses/i2c-eg20t.c

+12 −10
Original line number Diff line number Diff line
@@ -893,6 +893,13 @@ static int __devinit pch_i2c_probe(struct pci_dev *pdev, 
	/* Set the number of I2C channel instance */

	adap_info->ch_num = id->driver_data;



	ret = request_irq(pdev->irq, pch_i2c_handler, IRQF_SHARED,

		  KBUILD_MODNAME, adap_info);

	if (ret) {

		pch_pci_err(pdev, "request_irq FAILED\n");

		goto err_request_irq;

	}



	for (i = 0; i < adap_info->ch_num; i++) {

		pch_adap = &adap_info->pch_data[i].pch_adapter;

		adap_info->pch_i2c_suspended = false;
@@ -910,28 +917,23 @@ static int __devinit pch_i2c_probe(struct pci_dev *pdev, 


		pch_adap->dev.parent = &pdev->dev;



		pch_i2c_init(&adap_info->pch_data[i]);

		ret = i2c_add_adapter(pch_adap);

		if (ret) {

			pch_pci_err(pdev, "i2c_add_adapter[ch:%d] FAILED\n", i);

			goto err_i2c_add_adapter;

			goto err_add_adapter;

		}



		pch_i2c_init(&adap_info->pch_data[i]);

	}

	ret = request_irq(pdev->irq, pch_i2c_handler, IRQF_SHARED,

		  KBUILD_MODNAME, adap_info);

	if (ret) {

		pch_pci_err(pdev, "request_irq FAILED\n");

		goto err_i2c_add_adapter;

	}



	pci_set_drvdata(pdev, adap_info);

	pch_pci_dbg(pdev, "returns %d.\n", ret);

	return 0;



err_i2c_add_adapter:

err_add_adapter:

	for (j = 0; j < i; j++)

		i2c_del_adapter(&adap_info->pch_data[j].pch_adapter);

	free_irq(pdev->irq, adap_info);

err_request_irq:

	pci_iounmap(pdev, base_addr);

err_pci_iomap:

	pci_release_regions(pdev);

drivers/i2c/busses/i2c-omap.c

+6 −5
Original line number Diff line number Diff line
@@ -1047,13 +1047,14 @@ omap_i2c_probe(struct platform_device *pdev) 
		 * size. This is to ensure that we can handle the status on int

		 * call back latencies.

		 */

		if (dev->rev >= OMAP_I2C_REV_ON_3530_4430) {

			dev->fifo_size = 0;

			dev->b_hw = 0; /* Disable hardware fixes */

		} else {



		dev->fifo_size = (dev->fifo_size / 2);



		if (dev->rev >= OMAP_I2C_REV_ON_3530_4430)

			dev->b_hw = 0; /* Disable hardware fixes */

		else

			dev->b_hw = 1; /* Enable hardware fixes */

		}



		/* calculate wakeup latency constraint for MPU */

		if (dev->set_mpu_wkup_lat != NULL)

			dev->latency = (1000000 * dev->fifo_size) /

drivers/i2c/busses/i2c-s3c2410.c

+2 −1
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, 


	/* first, try busy waiting briefly */

	do {

		cpu_relax();

		iicstat = readl(i2c->regs + S3C2410_IICSTAT);

	} while ((iicstat & S3C2410_IICSTAT_START) && --spins);
@@ -786,7 +787,7 @@ static void s3c24xx_i2c_dt_gpio_free(struct s3c24xx_i2c *i2c) 
#else

static int s3c24xx_i2c_parse_dt_gpio(struct s3c24xx_i2c *i2c)

{

	return -EINVAL;

	return 0;

}



static void s3c24xx_i2c_dt_gpio_free(struct s3c24xx_i2c *i2c)