mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 08:49:45 +00:00
e6b5be2be4
Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlSOD20ACgkQMUfUDdst+ylLPACg2QrW1oHhdTMT9WI8jihlHVRM 53kAoLeteByQ3iVwWurwwseRPiWa8+MI =OVRS -----END PGP SIGNATURE----- Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core update from Greg KH: "Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while" * tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits) Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries" fs: debugfs: add forward declaration for struct device type firmware class: Deletion of an unnecessary check before the function call "vunmap" firmware loader: fix hung task warning dump devcoredump: provide a one-way disable function device: Add dev_<level>_once variants ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries ath: use seq_file api for ath9k debugfs files debugfs: add helper function to create device related seq_file drivers/base: cacheinfo: remove noisy error boot message Revert "core: platform: add warning if driver has no owner" drivers: base: support cpu cache information interface to userspace via sysfs drivers: base: add cpu_device_create to support per-cpu devices topology: replace custom attribute macros with standard DEVICE_ATTR* cpumask: factor out show_cpumap into separate helper function driver core: Fix unbalanced device reference in drivers_probe driver core: fix race with userland in device_add() sysfs/kernfs: make read requests on pre-alloc files use the buffer. sysfs/kernfs: allow attributes to request write buffer be pre-allocated. fs: sysfs: return EGBIG on write if offset is larger than file size ...
112 lines
3 KiB
C
112 lines
3 KiB
C
/*
|
|
* Copyright (C) 2009, Lars-Peter Clausen <lars@metafoo.de>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/platform_device.h>
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/soc.h>
|
|
#include <linux/gpio/consumer.h>
|
|
|
|
struct qi_lb60 {
|
|
struct gpio_desc *snd_gpio;
|
|
struct gpio_desc *amp_gpio;
|
|
};
|
|
|
|
static int qi_lb60_spk_event(struct snd_soc_dapm_widget *widget,
|
|
struct snd_kcontrol *ctrl, int event)
|
|
{
|
|
struct qi_lb60 *qi_lb60 = snd_soc_card_get_drvdata(widget->dapm->card);
|
|
int on = !SND_SOC_DAPM_EVENT_OFF(event);
|
|
|
|
gpiod_set_value_cansleep(qi_lb60->snd_gpio, on);
|
|
gpiod_set_value_cansleep(qi_lb60->amp_gpio, on);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct snd_soc_dapm_widget qi_lb60_widgets[] = {
|
|
SND_SOC_DAPM_SPK("Speaker", qi_lb60_spk_event),
|
|
SND_SOC_DAPM_MIC("Mic", NULL),
|
|
};
|
|
|
|
static const struct snd_soc_dapm_route qi_lb60_routes[] = {
|
|
{"Mic", NULL, "MIC"},
|
|
{"Speaker", NULL, "LOUT"},
|
|
{"Speaker", NULL, "ROUT"},
|
|
};
|
|
|
|
static struct snd_soc_dai_link qi_lb60_dai = {
|
|
.name = "jz4740",
|
|
.stream_name = "jz4740",
|
|
.cpu_dai_name = "jz4740-i2s",
|
|
.platform_name = "jz4740-i2s",
|
|
.codec_dai_name = "jz4740-hifi",
|
|
.codec_name = "jz4740-codec",
|
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
SND_SOC_DAIFMT_CBM_CFM,
|
|
};
|
|
|
|
static struct snd_soc_card qi_lb60_card = {
|
|
.name = "QI LB60",
|
|
.owner = THIS_MODULE,
|
|
.dai_link = &qi_lb60_dai,
|
|
.num_links = 1,
|
|
|
|
.dapm_widgets = qi_lb60_widgets,
|
|
.num_dapm_widgets = ARRAY_SIZE(qi_lb60_widgets),
|
|
.dapm_routes = qi_lb60_routes,
|
|
.num_dapm_routes = ARRAY_SIZE(qi_lb60_routes),
|
|
.fully_routed = true,
|
|
};
|
|
|
|
static int qi_lb60_probe(struct platform_device *pdev)
|
|
{
|
|
struct qi_lb60 *qi_lb60;
|
|
struct snd_soc_card *card = &qi_lb60_card;
|
|
|
|
qi_lb60 = devm_kzalloc(&pdev->dev, sizeof(*qi_lb60), GFP_KERNEL);
|
|
if (!qi_lb60)
|
|
return -ENOMEM;
|
|
|
|
qi_lb60->snd_gpio = devm_gpiod_get(&pdev->dev, "snd", GPIOD_OUT_LOW);
|
|
if (IS_ERR(qi_lb60->snd_gpio))
|
|
return PTR_ERR(qi_lb60->snd_gpio);
|
|
|
|
qi_lb60->amp_gpio = devm_gpiod_get(&pdev->dev, "amp", GPIOD_OUT_LOW);
|
|
if (IS_ERR(qi_lb60->amp_gpio))
|
|
return PTR_ERR(qi_lb60->amp_gpio);
|
|
|
|
card->dev = &pdev->dev;
|
|
|
|
snd_soc_card_set_drvdata(card, qi_lb60);
|
|
|
|
return devm_snd_soc_register_card(&pdev->dev, card);
|
|
}
|
|
|
|
static struct platform_driver qi_lb60_driver = {
|
|
.driver = {
|
|
.name = "qi-lb60-audio",
|
|
},
|
|
.probe = qi_lb60_probe,
|
|
};
|
|
|
|
module_platform_driver(qi_lb60_driver);
|
|
|
|
MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
|
|
MODULE_DESCRIPTION("ALSA SoC QI LB60 Audio support");
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_ALIAS("platform:qi-lb60-audio");
|