diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-31 05:25:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-31 05:25:02 -0400 |
commit | c9b95e5961c0294e0efffeaa847c1a1e6369204c (patch) | |
tree | 384daa5e36a795d48475d445b3857b47e0b3f8d3 /drivers/base | |
parent | bad60e6f259a01cf9f29a1ef8d435ab6c60b2de9 (diff) | |
parent | 0984d159c8ad6618c6ebd9f00bc3f374fa52bc35 (diff) |
Merge tag 'sound-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai:
"The majority of this update is about ASoC, including a few new
drivers, and the rest are mostly minor changes. The only substantial
change in ALSA core is about the additional error handling in the
compress-offload API. Below are highlights:
- Add the error propagating support in compress-offload API
- HD-audio: a usual Dell headset fixup, an Intel HDMI/DP fix, and the
default mixer setup change ot turn off the loopback
- Lots of updates for ASoC 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 ASoC drivers for Allwinner A10, Analog Devices ADAU7002,
Broadcom Cygnus, Cirrus Logic CS35L33 and CS53L30, Maxim MAX8960
and MAX98504, Realtek RT5514 and Wolfson WM8758"
* tag 'sound-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (278 commits)
sound: oss: Use kernel_read_file_from_path() for mod_firmware_load()
ASoC: Intel: Skylake: Delete an unnecessary check before the function call "release_firmware"
ASoC: Intel: Skylake: Fix NULL Pointer exception in dynamic_debug.
ASoC: samsung: Specify DMA channels through struct snd_dmaengine_pcm_config
ASoC: samsung: Fix error paths in the I2S driver's probe()
ASoC: cs53l30: Fix bit shift issue of TDM mode
ASoC: cs53l30: Fix a bug for TDM slot location validation
ASoC: rockchip: correct the spdif clk
ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members
ASoC: rsrc-card: use asoc_simple_card_parse_card_name()
ASoC: rsrc-card: use asoc_simple_dai instead of rsrc_card_dai
ASoC: rsrc-card: use asoc_simple_card_parse_dailink_name()
ASoC: simple-card: use asoc_simple_card_parse_card_name()
ASoC: simple-card-utils: add asoc_simple_card_parse_card_name()
ASoC: simple-card: use asoc_simple_card_parse_dailink_name()
ASoC: simple-card-utils: add asoc_simple_card_set_dailink_name()
ASoC: nau8825: drop redundant idiom when converting integer to boolean
ASoC: nau8825: jack connection decision with different insertion logic
ASoC: mediatek: Add HDMI dai-links to the mt8173-rt5650 machine driver
ASoC: mediatek: mt2701: fix non static symbol warning
...
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/property.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/drivers/base/property.c b/drivers/base/property.c index f38c21de29b7..43a36d68c3fd 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c | |||
@@ -888,6 +888,34 @@ struct fwnode_handle *device_get_next_child_node(struct device *dev, | |||
888 | EXPORT_SYMBOL_GPL(device_get_next_child_node); | 888 | EXPORT_SYMBOL_GPL(device_get_next_child_node); |
889 | 889 | ||
890 | /** | 890 | /** |
891 | * device_get_named_child_node - Return first matching named child node handle | ||
892 | * @dev: Device to find the named child node for. | ||
893 | * @childname: String to match child node name against. | ||
894 | */ | ||
895 | struct fwnode_handle *device_get_named_child_node(struct device *dev, | ||
896 | const char *childname) | ||
897 | { | ||
898 | struct fwnode_handle *child; | ||
899 | |||
900 | /* | ||
901 | * Find first matching named child node of this device. | ||
902 | * For ACPI this will be a data only sub-node. | ||
903 | */ | ||
904 | device_for_each_child_node(dev, child) { | ||
905 | if (is_of_node(child)) { | ||
906 | if (!of_node_cmp(to_of_node(child)->name, childname)) | ||
907 | return child; | ||
908 | } else if (is_acpi_data_node(child)) { | ||
909 | if (acpi_data_node_match(child, childname)) | ||
910 | return child; | ||
911 | } | ||
912 | } | ||
913 | |||
914 | return NULL; | ||
915 | } | ||
916 | EXPORT_SYMBOL_GPL(device_get_named_child_node); | ||
917 | |||
918 | /** | ||
891 | * fwnode_handle_put - Drop reference to a device node | 919 | * fwnode_handle_put - Drop reference to a device node |
892 | * @fwnode: Pointer to the device node to drop the reference to. | 920 | * @fwnode: Pointer to the device node to drop the reference to. |
893 | * | 921 | * |