From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 12 Jan 2016 00:08:47 +0000 (+0100)
Subject: Merge branch 'acpi-soc'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1e3f28a552c7acf6dd8acfe505beb4990e8cbd55;p=deliverable%2Flinux.git

Merge branch 'acpi-soc'

* acpi-soc:
  PM / clk: don't leave clocks enabled when driver not bound
  i2c: dw: Add APM X-Gene ACPI I2C device support
  ACPI / APD: Add APM X-Gene ACPI I2C device support
  ACPI / LPSS: change 'does not have' to 'has' in comment
  Revert "dmaengine: dw: platform: provide platform data for Intel"
  dmaengine: dw: return immediately from IRQ when DMA isn't in use
  dmaengine: dw: platform: power on device on shutdown
  ACPI / LPSS: override power state for LPSS DMA device
  ACPI / LPSS: power on when probe() and otherwise when remove()
  ACPI / LPSS: do delay for all LPSS devices when D3->D0
  ACPI / LPSS: allow to use specific PM domain during ->probe()
  Revert "ACPI / LPSS: allow to use specific PM domain during ->probe()"
  device core: add BUS_NOTIFY_DRIVER_NOT_BOUND notification
  x86/platform/iosf_mbi: Remove duplicate definitions

Conflicts:
	drivers/i2c/busses/i2c-designware-platdrv.c
---

1e3f28a552c7acf6dd8acfe505beb4990e8cbd55
diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
index cbd663deef38,423371d148d5..bf72ae740fc1
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@@ -122,7 -116,8 +122,8 @@@ static const struct acpi_device_id dw_i
  	{ "INT3433", 0 },
  	{ "80860F41", 0 },
  	{ "808622C1", 0 },
 -	{ "AMD0010", 0 },
 +	{ "AMD0010", ACCESS_INTR_MASK },
+ 	{ "APMC0D0F", 0 },
  	{ }
  };
  MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match);