summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-07-26 04:35:31 -0400
committerTakashi Iwai <tiwai@suse.de>2016-07-26 04:35:31 -0400
commit4a6baf1b35891ebc877e91a803877d69b703e086 (patch)
tree3a1368712165fb4fb18741b3496b514b2661b998 /include/acpi
parentcf81d6b583444cb6f5e656f050e43413b236354e (diff)
parente7ca8fcd15049b1e48ae2ef1434a68a51ef0ead5 (diff)
Merge tag 'asoc-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.8 Not really any framework work this time around (though we have seen one of the Analog Devices drivers move more to the clock API which is good to see) but rather a lot of new drivers: - Lots of updates for the Intel drivers, mostly board support and bug fixing, and to the NAU8825 driver. - Work on generalizing bits of simple-card to allow more code sharing with the Renesas rsrc-card (which can't use simple-card due to DPCM). - Removal of the Odroid X2 driver due to replacement with simple-card. - Support for several new Mediatek platforms and associated boards. - New drivers for Allwinner A10, Analog Devices ADAU7002, Broadcom Cygnus, Cirrus Logic CS35L33 and CS53L30, Maxim MAX8960 and MAX98504, Realtek RT5514 and Wolfson WM8758
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h7
-rw-r--r--include/acpi/acpi_drivers.h1
-rw-r--r--include/acpi/acpixf.h2
3 files changed, 9 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 788c6c35291a..c1a524de67c5 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -420,6 +420,13 @@ static inline struct acpi_data_node *to_acpi_data_node(struct fwnode_handle *fwn
420 container_of(fwnode, struct acpi_data_node, fwnode) : NULL; 420 container_of(fwnode, struct acpi_data_node, fwnode) : NULL;
421} 421}
422 422
423static inline bool acpi_data_node_match(struct fwnode_handle *fwnode,
424 const char *name)
425{
426 return is_acpi_data_node(fwnode) ?
427 (!strcmp(to_acpi_data_node(fwnode)->name, name)) : false;
428}
429
423static inline struct fwnode_handle *acpi_fwnode_handle(struct acpi_device *adev) 430static inline struct fwnode_handle *acpi_fwnode_handle(struct acpi_device *adev)
424{ 431{
425 return &adev->fwnode; 432 return &adev->fwnode;
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 797ae2ec8eee..29c691265b49 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -78,6 +78,7 @@
78 78
79/* ACPI PCI Interrupt Link (pci_link.c) */ 79/* ACPI PCI Interrupt Link (pci_link.c) */
80 80
81int acpi_irq_penalty_init(void);
81int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering, 82int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
82 int *polarity, char **name); 83 int *polarity, char **name);
83int acpi_pci_link_free_irq(acpi_handle handle); 84int acpi_pci_link_free_irq(acpi_handle handle);
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 4e4c21491c41..1ff3a76c265d 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -192,7 +192,7 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_do_not_use_xsdt, FALSE);
192/* 192/*
193 * Optionally support group module level code. 193 * Optionally support group module level code.
194 */ 194 */
195ACPI_INIT_GLOBAL(u8, acpi_gbl_group_module_level_code, FALSE); 195ACPI_INIT_GLOBAL(u8, acpi_gbl_group_module_level_code, TRUE);
196 196
197/* 197/*
198 * Optionally use 32-bit FADT addresses if and when there is a conflict 198 * Optionally use 32-bit FADT addresses if and when there is a conflict