* [PATCH V2 0/2] Add support for Pistachio internal DAC
@ 2015-12-08 17:05 Damien Horsley
2015-12-08 17:05 ` [PATCH V2 1/2] ASoC: img: Add binding document " Damien Horsley
2015-12-08 17:05 ` [PATCH V2 2/2] ASoC: img: Add driver " Damien Horsley
0 siblings, 2 replies; 5+ messages in thread
From: Damien Horsley @ 2015-12-08 17:05 UTC (permalink / raw
To: alsa-devel
Cc: Mark Rutland, devicetree, Pawel Moll, Ian Campbell, linux-kernel,
Mark Brown, Takashi Iwai, Liam Girdwood, Rob Herring, Kumar Gala,
Damien.Horsley, James Hartley
From: "Damien.Horsley" <Damien.Horsley@imgtec.com>
Add binding document and driver for Pistachio internal DAC
Damien.Horsley (2):
ASoC: img: Add binding document for Pistachio internal DAC
ASoC: img: Add driver for Pistachio internal DAC
.../bindings/sound/img,pistachio-internal-dac.txt | 18 ++
sound/soc/img/Kconfig | 8 +
sound/soc/img/Makefile | 2 +
sound/soc/img/pistachio-internal-dac.c | 316 +++++++++++++++++++++
4 files changed, 344 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt
create mode 100644 sound/soc/img/pistachio-internal-dac.c
--
2.1.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V2 1/2] ASoC: img: Add binding document for Pistachio internal DAC
2015-12-08 17:05 [PATCH V2 0/2] Add support for Pistachio internal DAC Damien Horsley
@ 2015-12-08 17:05 ` Damien Horsley
2015-12-08 17:05 ` [PATCH V2 2/2] ASoC: img: Add driver " Damien Horsley
1 sibling, 0 replies; 5+ messages in thread
From: Damien Horsley @ 2015-12-08 17:05 UTC (permalink / raw
To: alsa-devel
Cc: Mark Rutland, devicetree, Pawel Moll, Ian Campbell, linux-kernel,
Mark Brown, Takashi Iwai, Liam Girdwood, Rob Herring, Kumar Gala,
Damien.Horsley, James Hartley
From: "Damien.Horsley" <Damien.Horsley@imgtec.com>
Add binding document for Pistachio Internal DAC
Signed-off-by: Damien.Horsley <Damien.Horsley@imgtec.com>
---
.../bindings/sound/img,pistachio-internal-dac.txt | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt
diff --git a/Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt b/Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt
new file mode 100644
index 0000000..4cc18fc
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt
@@ -0,0 +1,18 @@
+Pistachio internal DAC DT bindings
+
+Required properties:
+
+ - compatible: "img,pistachio-internal-dac"
+
+ - img,cr-top : Must contain a phandle to the top level control syscon
+ node which contains the internal dac control registers
+
+ - VDD-supply : Digital power supply regulator (+1.8V or +3.3V)
+
+Examples:
+
+internal_dac: internal-dac {
+ compatible = "img,pistachio-internal-dac";
+ img,cr-top = <&cr_top>;
+ VDD-supply = <&supply3v3>;
+};
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH V2 2/2] ASoC: img: Add driver for Pistachio internal DAC
2015-12-08 17:05 [PATCH V2 0/2] Add support for Pistachio internal DAC Damien Horsley
2015-12-08 17:05 ` [PATCH V2 1/2] ASoC: img: Add binding document " Damien Horsley
@ 2015-12-08 17:05 ` Damien Horsley
2015-12-08 19:00 ` Mark Brown
1 sibling, 1 reply; 5+ messages in thread
From: Damien Horsley @ 2015-12-08 17:05 UTC (permalink / raw
To: alsa-devel
Cc: Mark Rutland, devicetree, Pawel Moll, Ian Campbell, linux-kernel,
Mark Brown, Takashi Iwai, Liam Girdwood, Rob Herring, Kumar Gala,
Damien.Horsley, James Hartley
From: "Damien.Horsley" <Damien.Horsley@imgtec.com>
Add driver for Pistachio Internal DAC
Signed-off-by: Damien.Horsley <Damien.Horsley@imgtec.com>
---
sound/soc/img/Kconfig | 8 +
sound/soc/img/Makefile | 2 +
sound/soc/img/pistachio-internal-dac.c | 316 +++++++++++++++++++++++++++++++++
3 files changed, 326 insertions(+)
create mode 100644 sound/soc/img/pistachio-internal-dac.c
diff --git a/sound/soc/img/Kconfig b/sound/soc/img/Kconfig
index d08537e..857a951 100644
--- a/sound/soc/img/Kconfig
+++ b/sound/soc/img/Kconfig
@@ -42,3 +42,11 @@ config SND_SOC_IMG_SPDIF_OUT
help
Say Y or M if you want to add support for SPDIF out driver for
Imagination Technologies SPDIF out device.
+
+
+config SND_SOC_IMG_PISTACHIO_INTERNAL_DAC
+ tristate "Support for Pistachio SoC Internal DAC Driver"
+ depends on SND_SOC_IMG
+ help
+ Say Y or M if you want to add support for Pistachio internal DAC
+ driver for Imagination Technologies Pistachio internal DAC device.
diff --git a/sound/soc/img/Makefile b/sound/soc/img/Makefile
index 1a44fb4..0508c1c 100644
--- a/sound/soc/img/Makefile
+++ b/sound/soc/img/Makefile
@@ -3,3 +3,5 @@ obj-$(CONFIG_SND_SOC_IMG_I2S_OUT) += img-i2s-out.o
obj-$(CONFIG_SND_SOC_IMG_PARALLEL_OUT) += img-parallel-out.o
obj-$(CONFIG_SND_SOC_IMG_SPDIF_IN) += img-spdif-in.o
obj-$(CONFIG_SND_SOC_IMG_SPDIF_OUT) += img-spdif-out.o
+
+obj-$(CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC) += pistachio-internal-dac.o
diff --git a/sound/soc/img/pistachio-internal-dac.c b/sound/soc/img/pistachio-internal-dac.c
new file mode 100644
index 0000000..df770bf
--- /dev/null
+++ b/sound/soc/img/pistachio-internal-dac.c
@@ -0,0 +1,316 @@
+/*
+ * Pistachio internal dac driver
+ *
+ * Copyright (C) 2015 Imagination Technologies Ltd.
+ *
+ * Author: Damien Horsley <Damien.Horsley@imgtec.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/pm_runtime.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+
+#define PISTACHIO_INTERNAL_DAC_CTRL 0x40
+#define PISTACHIO_INTERNAL_DAC_CTRL_MUTE_MASK 0x4
+#define PISTACHIO_INTERNAL_DAC_CTRL_PWR_SEL_MASK 0x2
+#define PISTACHIO_INTERNAL_DAC_CTRL_PWRDN_MASK 0x1
+
+#define PISTACHIO_INTERNAL_DAC_SRST 0x44
+#define PISTACHIO_INTERNAL_DAC_SRST_MASK 0x1
+
+#define PISTACHIO_INTERNAL_DAC_GTI_CTRL 0x48
+#define PISTACHIO_INTERNAL_DAC_GTI_CTRL_ADDR_SHIFT 0
+#define PISTACHIO_INTERNAL_DAC_GTI_CTRL_ADDR_MASK 0xFFF
+#define PISTACHIO_INTERNAL_DAC_GTI_CTRL_WE_MASK 0x1000
+#define PISTACHIO_INTERNAL_DAC_GTI_CTRL_WDATA_SHIFT 13
+#define PISTACHIO_INTERNAL_DAC_GTI_CTRL_WDATA_MASK 0x1FE000
+
+#define PISTACHIO_INTERNAL_DAC_PWR 0x1
+#define PISTACHIO_INTERNAL_DAC_PWR_MASK 0x1
+
+#define PISTACHIO_INTERNAL_DAC_FORMATS (SNDRV_PCM_FMTBIT_S24_LE | \
+ SNDRV_PCM_FMTBIT_S32_LE)
+
+/* codec private data */
+struct pistachio_internal_dac {
+ struct regmap *regmap;
+ struct regulator *supply;
+ bool mute;
+};
+
+static int pistachio_internal_dac_get_mute(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+ struct pistachio_internal_dac *dac = snd_soc_codec_get_drvdata(codec);
+
+ ucontrol->value.integer.value[0] = dac->mute;
+
+ return 0;
+}
+
+static int pistachio_internal_dac_set_mute(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+ struct pistachio_internal_dac *dac = snd_soc_codec_get_drvdata(codec);
+ u32 reg;
+
+ dac->mute = ucontrol->value.integer.value[0];
+
+ if (dac->mute)
+ reg = PISTACHIO_INTERNAL_DAC_CTRL_MUTE_MASK;
+ else
+ reg = 0;
+
+ regmap_update_bits(dac->regmap, PISTACHIO_INTERNAL_DAC_CTRL,
+ PISTACHIO_INTERNAL_DAC_CTRL_MUTE_MASK, reg);
+
+ return 0;
+}
+
+static const struct snd_kcontrol_new pistachio_internal_dac_snd_controls[] = {
+ {
+ .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+ .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+ .name = "Mute Switch",
+ .info = snd_ctl_boolean_mono_info,
+ .get = pistachio_internal_dac_get_mute,
+ .put = pistachio_internal_dac_set_mute,
+ }
+};
+
+static const struct snd_soc_dapm_widget pistachio_internal_dac_widgets[] = {
+ SND_SOC_DAPM_DAC("DAC", "Playback", SND_SOC_NOPM, 0, 0),
+ SND_SOC_DAPM_OUTPUT("AOUTL"),
+ SND_SOC_DAPM_OUTPUT("AOUTR"),
+};
+
+static const struct snd_soc_dapm_route pistachio_internal_dac_routes[] = {
+ { "AOUTL", NULL, "DAC" },
+ { "AOUTR", NULL, "DAC" },
+};
+
+static void pistachio_internal_dac_reg_writel(struct regmap *top_regs,
+ u32 val, u32 reg)
+{
+ regmap_update_bits(top_regs, PISTACHIO_INTERNAL_DAC_GTI_CTRL,
+ PISTACHIO_INTERNAL_DAC_GTI_CTRL_ADDR_MASK,
+ reg << PISTACHIO_INTERNAL_DAC_GTI_CTRL_ADDR_SHIFT);
+
+ regmap_update_bits(top_regs, PISTACHIO_INTERNAL_DAC_GTI_CTRL,
+ PISTACHIO_INTERNAL_DAC_GTI_CTRL_WDATA_MASK,
+ val << PISTACHIO_INTERNAL_DAC_GTI_CTRL_WDATA_SHIFT);
+
+ regmap_update_bits(top_regs, PISTACHIO_INTERNAL_DAC_GTI_CTRL,
+ PISTACHIO_INTERNAL_DAC_GTI_CTRL_WE_MASK,
+ PISTACHIO_INTERNAL_DAC_GTI_CTRL_WE_MASK);
+
+ regmap_update_bits(top_regs, PISTACHIO_INTERNAL_DAC_GTI_CTRL,
+ PISTACHIO_INTERNAL_DAC_GTI_CTRL_WE_MASK, 0);
+}
+
+static void pistachio_internal_dac_pwr_off(struct pistachio_internal_dac *dac)
+{
+ regmap_update_bits(dac->regmap, PISTACHIO_INTERNAL_DAC_CTRL,
+ PISTACHIO_INTERNAL_DAC_CTRL_PWRDN_MASK,
+ PISTACHIO_INTERNAL_DAC_CTRL_PWRDN_MASK);
+
+ pistachio_internal_dac_reg_writel(dac->regmap, 0,
+ PISTACHIO_INTERNAL_DAC_PWR);
+}
+
+static void pistachio_internal_dac_pwr_on(struct pistachio_internal_dac *dac)
+{
+ regmap_update_bits(dac->regmap, PISTACHIO_INTERNAL_DAC_SRST,
+ PISTACHIO_INTERNAL_DAC_SRST_MASK,
+ PISTACHIO_INTERNAL_DAC_SRST_MASK);
+
+ regmap_update_bits(dac->regmap, PISTACHIO_INTERNAL_DAC_SRST,
+ PISTACHIO_INTERNAL_DAC_SRST_MASK, 0);
+
+ pistachio_internal_dac_reg_writel(dac->regmap,
+ PISTACHIO_INTERNAL_DAC_PWR_MASK,
+ PISTACHIO_INTERNAL_DAC_PWR);
+
+ regmap_update_bits(dac->regmap, PISTACHIO_INTERNAL_DAC_CTRL,
+ PISTACHIO_INTERNAL_DAC_CTRL_PWRDN_MASK, 0);
+}
+
+static struct snd_soc_dai_driver pistachio_internal_dac_dais[] = {
+ {
+ .name = "pistachio_internal_dac",
+ .playback = {
+ .stream_name = "Playback",
+ .channels_min = 2,
+ .channels_max = 2,
+ .rates = SNDRV_PCM_RATE_8000_48000,
+ .formats = PISTACHIO_INTERNAL_DAC_FORMATS,
+ }
+ },
+};
+
+static const struct snd_soc_codec_driver pistachio_internal_dac_driver = {
+ .idle_bias_off = true,
+ .controls = pistachio_internal_dac_snd_controls,
+ .num_controls = ARRAY_SIZE(pistachio_internal_dac_snd_controls),
+ .dapm_widgets = pistachio_internal_dac_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(pistachio_internal_dac_widgets),
+ .dapm_routes = pistachio_internal_dac_routes,
+ .num_dapm_routes = ARRAY_SIZE(pistachio_internal_dac_routes),
+};
+
+static int pistachio_internal_dac_probe(struct platform_device *pdev)
+{
+ struct pistachio_internal_dac *dac;
+ int ret, voltage;
+ struct device *dev = &pdev->dev;
+ u32 reg;
+
+ dac = devm_kzalloc(dev, sizeof(*dac), GFP_KERNEL);
+
+ if (!dac)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, dac);
+
+ dac->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
+ "img,cr-top");
+ if (IS_ERR(dac->regmap))
+ return PTR_ERR(dac->regmap);
+
+ dac->supply = devm_regulator_get(dev, "VDD");
+ if (IS_ERR(dac->supply)) {
+ ret = PTR_ERR(dac->supply);
+ if (ret != -EPROBE_DEFER)
+ dev_err(dev, "failed to acquire supply 'VDD-supply': %d\n", ret);
+ return ret;
+ }
+
+ ret = regulator_enable(dac->supply);
+ if (ret) {
+ dev_err(dev, "failed to enable supply: %d\n", ret);
+ return ret;
+ }
+
+ voltage = regulator_get_voltage(dac->supply);
+
+ switch (voltage) {
+ case 1800000:
+ reg = 0;
+ break;
+ case 3300000:
+ reg = PISTACHIO_INTERNAL_DAC_CTRL_PWR_SEL_MASK;
+ break;
+ default:
+ dev_err(dev, "invalid voltage: %d\n", voltage);
+ ret = -EINVAL;
+ goto err_regulator;
+ }
+
+ regmap_update_bits(dac->regmap, PISTACHIO_INTERNAL_DAC_CTRL,
+ PISTACHIO_INTERNAL_DAC_CTRL_PWR_SEL_MASK, reg);
+
+ pistachio_internal_dac_pwr_off(dac);
+ pistachio_internal_dac_pwr_on(dac);
+
+ pm_runtime_set_active(dev);
+ pm_runtime_enable(dev);
+ pm_runtime_idle(dev);
+
+ ret = snd_soc_register_codec(dev, &pistachio_internal_dac_driver,
+ pistachio_internal_dac_dais,
+ ARRAY_SIZE(pistachio_internal_dac_dais));
+ if (ret) {
+ dev_err(dev, "failed to register codec: %d\n", ret);
+ goto err_pwr;
+ }
+
+ return 0;
+
+err_pwr:
+ pm_runtime_disable(&pdev->dev);
+ pistachio_internal_dac_pwr_off(dac);
+err_regulator:
+ regulator_disable(dac->supply);
+
+ return ret;
+}
+
+static int pistachio_internal_dac_remove(struct platform_device *pdev)
+{
+ struct pistachio_internal_dac *dac = dev_get_drvdata(&pdev->dev);
+
+ snd_soc_unregister_codec(&pdev->dev);
+ pm_runtime_disable(&pdev->dev);
+ pistachio_internal_dac_pwr_off(dac);
+ regulator_disable(dac->supply);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM
+static int pistachio_internal_dac_rt_resume(struct device *dev)
+{
+ struct pistachio_internal_dac *dac = dev_get_drvdata(dev);
+ int ret;
+
+ ret = regulator_enable(dac->supply);
+ if (ret) {
+ dev_err(dev, "failed to enable supply: %d\n", ret);
+ return ret;
+ }
+
+ pistachio_internal_dac_pwr_on(dac);
+
+ return 0;
+}
+
+static int pistachio_internal_dac_rt_suspend(struct device *dev)
+{
+ struct pistachio_internal_dac *dac = dev_get_drvdata(dev);
+
+ pistachio_internal_dac_pwr_off(dac);
+
+ regulator_disable(dac->supply);
+
+ return 0;
+}
+#endif
+
+static const struct dev_pm_ops pistachio_internal_dac_pm_ops = {
+ SET_RUNTIME_PM_OPS(pistachio_internal_dac_rt_suspend,
+ pistachio_internal_dac_rt_resume, NULL)
+};
+
+static const struct of_device_id pistachio_internal_dac_of_match[] = {
+ { .compatible = "img,pistachio-internal-dac" },
+ {}
+};
+MODULE_DEVICE_TABLE(of, pistachio_internal_dac_of_match);
+
+static struct platform_driver pistachio_internal_dac_plat_driver = {
+ .driver = {
+ .name = "img-pistachio-internal-dac",
+ .of_match_table = pistachio_internal_dac_of_match,
+ .pm = &pistachio_internal_dac_pm_ops
+ },
+ .probe = pistachio_internal_dac_probe,
+ .remove = pistachio_internal_dac_remove
+};
+module_platform_driver(pistachio_internal_dac_plat_driver);
+
+MODULE_DESCRIPTION("Pistachio Internal DAC driver");
+MODULE_AUTHOR("Damien Horsley <Damien.Horsley@imgtec.com>");
+MODULE_LICENSE("GPL v2");
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH V2 2/2] ASoC: img: Add driver for Pistachio internal DAC
@ 2015-12-08 19:00 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2015-12-08 19:00 UTC (permalink / raw
To: Damien Horsley
Cc: alsa-devel, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala, Liam Girdwood, Jaroslav Kysela, Takashi Iwai,
devicetree, linux-kernel, James Hartley
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
On Tue, Dec 08, 2015 at 05:05:24PM +0000, Damien Horsley wrote:
> +static int pistachio_internal_dac_set_mute(struct snd_kcontrol *kcontrol,
> + struct snd_ctl_elem_value *ucontrol)
> +{
> + struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
> + struct pistachio_internal_dac *dac = snd_soc_codec_get_drvdata(codec);
> + u32 reg;
> +
> + dac->mute = ucontrol->value.integer.value[0];
> +
> + if (dac->mute)
> + reg = PISTACHIO_INTERNAL_DAC_CTRL_MUTE_MASK;
> + else
> + reg = 0;
> +
> + regmap_update_bits(dac->regmap, PISTACHIO_INTERNAL_DAC_CTRL,
> + PISTACHIO_INTERNAL_DAC_CTRL_MUTE_MASK, reg);
> +
> + return 0;
> +}
Shouldn't this just be a standard SOC_SINGLE() now? We've got a regmap.
Otherwise this looks good.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V2 2/2] ASoC: img: Add driver for Pistachio internal DAC
@ 2015-12-08 19:00 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2015-12-08 19:00 UTC (permalink / raw
To: Damien Horsley
Cc: alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala, Liam Girdwood,
Jaroslav Kysela, Takashi Iwai, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, James Hartley
[-- Attachment #1: Type: text/plain, Size: 743 bytes --]
On Tue, Dec 08, 2015 at 05:05:24PM +0000, Damien Horsley wrote:
> +static int pistachio_internal_dac_set_mute(struct snd_kcontrol *kcontrol,
> + struct snd_ctl_elem_value *ucontrol)
> +{
> + struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
> + struct pistachio_internal_dac *dac = snd_soc_codec_get_drvdata(codec);
> + u32 reg;
> +
> + dac->mute = ucontrol->value.integer.value[0];
> +
> + if (dac->mute)
> + reg = PISTACHIO_INTERNAL_DAC_CTRL_MUTE_MASK;
> + else
> + reg = 0;
> +
> + regmap_update_bits(dac->regmap, PISTACHIO_INTERNAL_DAC_CTRL,
> + PISTACHIO_INTERNAL_DAC_CTRL_MUTE_MASK, reg);
> +
> + return 0;
> +}
Shouldn't this just be a standard SOC_SINGLE() now? We've got a regmap.
Otherwise this looks good.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-12-08 19:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-08 17:05 [PATCH V2 0/2] Add support for Pistachio internal DAC Damien Horsley
2015-12-08 17:05 ` [PATCH V2 1/2] ASoC: img: Add binding document " Damien Horsley
2015-12-08 17:05 ` [PATCH V2 2/2] ASoC: img: Add driver " Damien Horsley
2015-12-08 19:00 ` Mark Brown
2015-12-08 19:00 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.