GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branches 'acpi-init', 'acpi-pnp', 'acpi-scan', 'acpi-proc' and 'acpi-doc'

Browse source 
* acpi-init:
  ACPI / init: Switch over platform to the ACPI mode later

* acpi-pnp:
  ACPI / PNP: Avoid conflicting resource reservations

* acpi-scan:
  ACPI / scan: constify ACPI device ids
  ACPI / property: Define a symbol for PRP0001
  ACPI / property: Refine consistency check for PRP0001

* acpi-proc:
  ACPI / proc: make ACPI_PROCFS_POWER X86 only

* acpi-doc:
  ACPI: Constify ACPI device IDs in documentation
  ACPI / enumeration: Document the rules regarding the PRP0001 device ID
  ACPI: fix kernel-parameters ordering in Documentation
This commit is contained in:
Rafael J. Wysocki 2015-06-19 01:15:49 +02:00
commit 3a5cf05adf
13 changed files with 378 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/linux/acpi.h
View file

@ -332,6 +332,9 @@ int acpi_check_region(resource_size_t start, resource_size_t n,
int acpi_resources_are_enforced(void);
int acpi_reserve_region(u64 start, unsigned int length, u8 space_id,
unsigned long flags, char *desc);
#ifdef CONFIG_HIBERNATION
void __init acpi_no_s4_hw_signature(void);
#endif
@ -440,6 +443,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
#define ACPI_OST_SC_INSERT_NOT_SUPPORTED 0x82
extern void acpi_early_init(void);
extern void acpi_subsystem_init(void);
extern int acpi_nvs_register(__u64 start, __u64 size);
@ -494,6 +498,7 @@ static inline const char *acpi_dev_name(struct acpi_device *adev)
}
static inline void acpi_early_init(void) { }
static inline void acpi_subsystem_init(void) { }
static inline int early_acpi_boot_init(void)
{
@ -525,6 +530,13 @@ static inline int acpi_check_region(resource_size_t start, resource_size_t n,
return 0;
}
static inline int acpi_reserve_region(u64 start, unsigned int length,
u8 space_id, unsigned long flags,
char *desc)
{
return -ENXIO;
}
struct acpi_table_header;
static inline int acpi_table_parse(char *id,
int (*handler)(struct acpi_table_header *))