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)
This commit is contained in:
Rafael J. Wysocki 2013-06-28 12:59:02 +02:00
commit f4c9f40238
2 changed files with 116 additions and 13 deletions

View file

@ -1,5 +1,5 @@
/*
* Intel Lynxpoint LPSS clocks.
* Intel Low Power Subsystem clocks.
*
* Copyright (C) 2013, Intel Corporation
* Authors: Mika Westerberg <mika.westerberg@linux.intel.com>
@ -18,8 +18,6 @@
#include <linux/platform_data/clk-lpss.h>
#include <linux/platform_device.h>
#define PRV_CLOCK_PARAMS 0x800
static int lpt_clk_probe(struct platform_device *pdev)
{
struct lpss_clk_data *drvdata;