From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Nov 2015 19:58:25 +0000 (-0800)
Subject: Merge branch 'i2c/for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
X-Git-Tag: firefly_0821_release~176^2~736
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=d55fc37856244c929965c190c8e9dcb49e2c07aa

Merge branch 'i2c/for-4.4' of git://git./linux/kernel/git/wsa/linux

Pull i2c updates from Wolfram Sang:

 - New drivers: UniPhier (with and without FIFO)

 - some drivers got some bigger rework: ismt, designware, img-scb (rcar
   had to be reverted because issues were showing up just lately)

 - ACPI: reworked the device scanning and added support for muxes

... and quite a lot of driver bugfixes and cleanups this time.  All
files touched outside of the i2c realm have proper acks.

* 'i2c/for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (70 commits)
  i2c: rcar: Revert the latest refactoring series
  i2c: pnx: remove superfluous assignment
  MAINTAINERS: i2c: drop i2c-pnx maintainer
  MAINTAINERS: i2c: mark also subdirectories as maintained
  i2c: cadence: enable driver for ARM64
  i2c: i801: Document Intel DNV and Broxton
  i2c: at91: manage unexpected RXRDY flag when starting a transfer
  i2c: pnx: Use setup_timer instead of open coding it
  i2c: add ACPI support for I2C mux ports
  acpi: add acpi_preset_companion() stub
  i2c: pxa: Add support for pxa910/988 & new configuration features
  i2c: au1550: Convert to devm_kzalloc and devm_ioremap_resource
  i2c-dev: Fix I2C_SLAVE ioctl comment
  i2c-dev: Fix typo in ioctl name reference
  i2c: sirf: tune the divider to make i2c bus freq more accurate
  i2c: imx: Use -ENXIO as error in the NACK case
  i2c: i801: Add support for Intel Broxton
  i2c: i801: Add support for Intel DNV
  i2c: mediatek: add i2c resume support
  i2c: imx: implement bus recovery
  ...
---

d55fc37856244c929965c190c8e9dcb49e2c07aa
diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
index 472b88285c75,190a0d2b94e7..809579ecb5a4
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@@ -251,28 -203,17 +223,13 @@@ static int dw_i2c_plat_probe(struct pla
  		dev->rx_fifo_depth = ((param1 >> 8)  & 0xff) + 1;
  		dev->adapter.nr = pdev->id;
  	}
- 	r = i2c_dw_init(dev);
- 	if (r)
- 		return r;
- 
- 	i2c_dw_disable_int(dev);
- 	r = devm_request_irq(&pdev->dev, dev->irq, i2c_dw_isr, IRQF_SHARED,
- 			pdev->name, dev);
- 	if (r) {
- 		dev_err(&pdev->dev, "failure requesting irq %i\n", dev->irq);
- 		return r;
- 	}
  
  	adap = &dev->adapter;
- 	i2c_set_adapdata(adap, dev);
  	adap->owner = THIS_MODULE;
  	adap->class = I2C_CLASS_DEPRECATED;
- 	strlcpy(adap->name, "Synopsys DesignWare I2C adapter",
- 			sizeof(adap->name));
- 	adap->algo = &i2c_dw_algo;
- 	adap->dev.parent = &pdev->dev;
+ 	ACPI_COMPANION_SET(&adap->dev, ACPI_COMPANION(&pdev->dev));
  	adap->dev.of_node = pdev->dev.of_node;
  
 -	r = i2c_dw_probe(dev);
 -	if (r)
 -		return r;
 -
  	if (dev->pm_runtime_disabled) {
  		pm_runtime_forbid(&pdev->dev);
  	} else {
@@@ -282,13 -223,6 +239,12 @@@
  		pm_runtime_enable(&pdev->dev);
  	}
  
- 	r = i2c_add_numbered_adapter(adap);
++	r = i2c_dw_probe(dev);
 +	if (r) {
- 		dev_err(&pdev->dev, "failure adding adapter\n");
 +		pm_runtime_disable(&pdev->dev);
 +		return r;
 +	}
 +
  	return 0;
  }