Commit bcacbdbd authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-enumeration' 

* acpi-enumeration:
  ACPI: remove unnecessary INIT_LIST_HEAD
  ACPI / platform: include missed header into acpi_platform.c
  platform / ACPI: Attach/detach ACPI PM during probe/remove/shutdown
  mmc: sdhci-acpi: add SDHCI ACPI driver
  ACPI: add SDHCI to ACPI platform devices
  ACPI / PNP: skip ACPI device nodes associated with physical nodes already
  i2c / ACPI: add ACPI enumeration support
  ACPI / platform: Initialize ACPI handles of platform devices in advance
  ACPI / driver core: Introduce struct acpi_dev_node and related macros
  ACPI: Allow ACPI handles of devices to be initialized in advance
  ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks
  ACPI: Centralized processing of ACPI device resources
  ACPI / platform: Use common ACPI device resource parsing routines
  ACPI: Move device resources interpretation code from PNP to ACPI core
  ACPI / platform: use ACPI device name instead of _HID._UID
  ACPI: Add support for platform bus type
  ACPI / ia64: Export acpi_[un]register_gsi()
  ACPI / x86: Export acpi_[un]register_gsi()
  ACPI: Provide generic functions for matching ACPI device nodes
  driver core / ACPI: Move ACPI support to core device and driver types
parents acd84433 752cad76

arch/ia64/include/asm/device.h

+0 −3
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ 
#define _ASM_IA64_DEVICE_H



struct dev_archdata {

#ifdef CONFIG_ACPI

	void	*acpi_handle;

#endif

#ifdef CONFIG_INTEL_IOMMU

	void *iommu; /* hook for IOMMU specific extension */

#endif

arch/ia64/kernel/acpi.c

+2 −0
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int triggering, int polarity) 
				      ACPI_EDGE_SENSITIVE) ? IOSAPIC_EDGE :

				     IOSAPIC_LEVEL);

}

EXPORT_SYMBOL_GPL(acpi_register_gsi);



void acpi_unregister_gsi(u32 gsi)

{
@@ -644,6 +645,7 @@ void acpi_unregister_gsi(u32 gsi) 


	iosapic_unregister_intr(gsi);

}

EXPORT_SYMBOL_GPL(acpi_unregister_gsi);



static int __init acpi_parse_fadt(struct acpi_table_header *table)

{

arch/x86/include/asm/device.h

+0 −3
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
#define _ASM_X86_DEVICE_H



struct dev_archdata {

#ifdef CONFIG_ACPI

	void	*acpi_handle;

#endif

#ifdef CONFIG_X86_DEV_DMA_OPS

	struct dma_map_ops *dma_ops;

#endif

arch/x86/kernel/acpi/boot.c

+6 −0
Original line number Diff line number Diff line
@@ -574,6 +574,12 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) 


	return irq;

}

EXPORT_SYMBOL_GPL(acpi_register_gsi);



void acpi_unregister_gsi(u32 gsi)

{

}

EXPORT_SYMBOL_GPL(acpi_unregister_gsi);



void __init acpi_set_irq_model_pic(void)

{

drivers/acpi/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -181,6 +181,12 @@ config ACPI_DOCK 
	  This driver supports ACPI-controlled docking stations and removable

	  drive bays such as the IBM Ultrabay and the Dell Module Bay.



config ACPI_I2C

	def_tristate I2C

	depends on I2C

	help

	  ACPI I2C enumeration support.



config ACPI_PROCESSOR

	tristate "Processor"

	select THERMAL