* [PATCH 1/2] ASoC: wm8782: add device-tree matching table
@ 2018-05-21 21:54 Daniel Mack
2018-05-21 21:54 ` [PATCH 2/2] ASoC: make wm8782 codec selectable in Kconfig Daniel Mack
2018-05-22 10:58 ` Applied "ASoC: wm8782: add device-tree matching table" " Mark Brown
0 siblings, 2 replies; 4+ messages in thread
From: Daniel Mack @ 2018-05-21 21:54 UTC (permalink / raw)
To: lgirdwood, broonie; +Cc: alsa-devel, Daniel Mack
This is needed when the codec is instanciated from from a device tree.
Signed-off-by: Daniel Mack <daniel@zonque.org>
---
sound/soc/codecs/wm8782.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/sound/soc/codecs/wm8782.c b/sound/soc/codecs/wm8782.c
index 7949703f3d04..317db9a149a7 100644
--- a/sound/soc/codecs/wm8782.c
+++ b/sound/soc/codecs/wm8782.c
@@ -67,9 +67,18 @@ static int wm8782_probe(struct platform_device *pdev)
&soc_component_dev_wm8782, &wm8782_dai, 1);
}
+#ifdef CONFIG_OF
+static const struct of_device_id wm8782_of_match[] = {
+ { .compatible = "wlf,wm8782", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, wm8782_of_match);
+#endif
+
static struct platform_driver wm8782_codec_driver = {
.driver = {
.name = "wm8782",
+ .of_match_table = of_match_ptr(wm8782_of_match),
},
.probe = wm8782_probe,
};
--
2.14.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ASoC: make wm8782 codec selectable in Kconfig
2018-05-21 21:54 [PATCH 1/2] ASoC: wm8782: add device-tree matching table Daniel Mack
@ 2018-05-21 21:54 ` Daniel Mack
2018-05-22 10:58 ` Applied "ASoC: make wm8782 codec selectable in Kconfig" to the asoc tree Mark Brown
2018-05-22 10:58 ` Applied "ASoC: wm8782: add device-tree matching table" " Mark Brown
1 sibling, 1 reply; 4+ messages in thread
From: Daniel Mack @ 2018-05-21 21:54 UTC (permalink / raw)
To: lgirdwood, broonie; +Cc: alsa-devel, Daniel Mack
FOr platforms that use the simple-card driver, the codec cannot be selected
through 'select' magic in Kconfig. So turn this into a real config option.
Signed-off-by: Daniel Mack <daniel@zonque.org>
---
sound/soc/codecs/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 9548f63ca531..c389173a34d3 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -1111,7 +1111,7 @@ config SND_SOC_WM8776
depends on SND_SOC_I2C_AND_SPI
config SND_SOC_WM8782
- tristate
+ tristate "Wolfson Microelectronics WM8782 ADC"
config SND_SOC_WM8804
tristate
--
2.14.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Applied "ASoC: make wm8782 codec selectable in Kconfig" to the asoc tree
2018-05-21 21:54 ` [PATCH 2/2] ASoC: make wm8782 codec selectable in Kconfig Daniel Mack
@ 2018-05-22 10:58 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2018-05-22 10:58 UTC (permalink / raw)
To: Daniel Mack; +Cc: alsa-devel, broonie, lgirdwood
The patch
ASoC: make wm8782 codec selectable in Kconfig
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 2da48013f2c7eabc16dc0ce64a325ad3e9743fee Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@zonque.org>
Date: Mon, 21 May 2018 23:54:50 +0200
Subject: [PATCH] ASoC: make wm8782 codec selectable in Kconfig
FOr platforms that use the simple-card driver, the codec cannot be selected
through 'select' magic in Kconfig. So turn this into a real config option.
Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index a3e7c44c6586..55a989d15b46 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -1131,7 +1131,7 @@ config SND_SOC_WM8776
depends on SND_SOC_I2C_AND_SPI
config SND_SOC_WM8782
- tristate
+ tristate "Wolfson Microelectronics WM8782 ADC"
config SND_SOC_WM8804
tristate
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Applied "ASoC: wm8782: add device-tree matching table" to the asoc tree
2018-05-21 21:54 [PATCH 1/2] ASoC: wm8782: add device-tree matching table Daniel Mack
2018-05-21 21:54 ` [PATCH 2/2] ASoC: make wm8782 codec selectable in Kconfig Daniel Mack
@ 2018-05-22 10:58 ` Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2018-05-22 10:58 UTC (permalink / raw)
To: Daniel Mack; +Cc: alsa-devel, broonie, lgirdwood
The patch
ASoC: wm8782: add device-tree matching table
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 9e2a87746757690fe951f06b0f336329f4a1f767 Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@zonque.org>
Date: Mon, 21 May 2018 23:54:49 +0200
Subject: [PATCH] ASoC: wm8782: add device-tree matching table
This is needed when the codec is instanciated from from a device tree.
Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/wm8782.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/sound/soc/codecs/wm8782.c b/sound/soc/codecs/wm8782.c
index 7949703f3d04..317db9a149a7 100644
--- a/sound/soc/codecs/wm8782.c
+++ b/sound/soc/codecs/wm8782.c
@@ -67,9 +67,18 @@ static int wm8782_probe(struct platform_device *pdev)
&soc_component_dev_wm8782, &wm8782_dai, 1);
}
+#ifdef CONFIG_OF
+static const struct of_device_id wm8782_of_match[] = {
+ { .compatible = "wlf,wm8782", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, wm8782_of_match);
+#endif
+
static struct platform_driver wm8782_codec_driver = {
.driver = {
.name = "wm8782",
+ .of_match_table = of_match_ptr(wm8782_of_match),
},
.probe = wm8782_probe,
};
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-22 10:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-21 21:54 [PATCH 1/2] ASoC: wm8782: add device-tree matching table Daniel Mack
2018-05-21 21:54 ` [PATCH 2/2] ASoC: make wm8782 codec selectable in Kconfig Daniel Mack
2018-05-22 10:58 ` Applied "ASoC: make wm8782 codec selectable in Kconfig" to the asoc tree Mark Brown
2018-05-22 10:58 ` Applied "ASoC: wm8782: add device-tree matching table" " Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox