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)

diff --cc drivers/acpi/acpi_lpss.c
index cab13f2fc28e3033aaed24adbbf618199473bb28,a4e8c0337a59814ca88760cf991698de0abe0306..6a382188fa20a7f2f67f8f45d506439f8e45db7b
--- 1/drivers/acpi/acpi_lpss.c
--- 2/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)