From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 28 Jun 2013 10:59:02 +0000 (+0200)
Subject: Merge branch 'acpi-lpss'
X-Git-Tag: upstream/snapshot3+hdmi~4790^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4c9f402389977dc852ef4848c7615926306735d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'acpi-lpss'

* acpi-lpss:
  ACPI / LPSS: override SDIO private register space size from ACPI tables
  ACPI / LPSS: mask the UART TX completion interrupt
  ACPI / LPSS: add support for Intel BayTrail

Conflicts:
	drivers/acpi/acpi_lpss.c (with commit b9e95fc)
---

f4c9f402389977dc852ef4848c7615926306735d
diff --cc drivers/acpi/acpi_lpss.c
index cab13f2,a4e8c03..6a38218
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@@ -170,18 -275,9 +272,21 @@@ static int acpi_lpss_create_device(stru
  		}
  	}
  
 +	/*
 +	 * This works around a known issue in ACPI tables where LPSS devices
 +	 * have _PS0 and _PS3 without _PSC (and no power resources), so
 +	 * acpi_bus_init_power() will assume that the BIOS has put them into D0.
 +	 */
 +	ret = acpi_device_fix_up_power(adev);
 +	if (ret) {
 +		/* Skip the device, but continue the namespace scan. */
 +		ret = 0;
 +		goto err_out;
 +	}
 +
+ 	if (dev_desc->setup)
+ 		dev_desc->setup(pdata);
+ 
  	adev->driver_data = pdata;
  	ret = acpi_create_platform_device(adev, id);
  	if (ret > 0)