]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
x86: sound: Add sound support for samus (broadwell)
authorSimon Glass <sjg@chromium.org>
Sun, 17 Feb 2019 03:25:06 +0000 (20:25 -0700)
committerBin Meng <bmeng.cn@gmail.com>
Wed, 20 Feb 2019 07:27:11 +0000 (15:27 +0800)
Add a sound driver for samus which ties together the audio codec and
I2S controller.

For now broadwell_sound is commented out in the makefile since we cannot
compile it without sound support enabled. The next commit fixes this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
drivers/sound/Makefile
drivers/sound/broadwell_sound.c [new file with mode: 0644]

index fe3ccd6e5c6e1041dcdf9ed4cf4326b675ee912b..452a5a17616fa69ef238565c441ce915e9304da4 100644 (file)
@@ -18,5 +18,5 @@ obj-$(CONFIG_SOUND_MAX98095)  += max98095.o maxim_codec.o
 obj-$(CONFIG_SOUND_INTEL_HDA)  += hda_codec.o
 obj-$(CONFIG_SOUND_I8254)      += i8254_beep.o
 obj-$(CONFIG_SOUND_RT5677)     += rt5677.o
-obj-$(CONFIG_INTEL_BROADWELL)  += broadwell_i2s.o
+obj-$(CONFIG_INTEL_BROADWELL)  += broadwell_i2s.o #broadwell_sound.o
 obj-$(CONFIG_SOUND_IVYBRIDGE)  += ivybridge_sound.o
diff --git a/drivers/sound/broadwell_sound.c b/drivers/sound/broadwell_sound.c
new file mode 100644 (file)
index 0000000..6e083fe
--- /dev/null
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Sound for broadwell
+ *
+ * Copyright 2019 Google LLC
+ * Written by Simon Glass <sjg@chromium.org>
+ */
+
+#define LOG_CATEGORY UCLASS_SOUND
+
+#include <common.h>
+#include <audio_codec.h>
+#include <dm.h>
+#include <i2s.h>
+#include <sound.h>
+
+static int broadwell_sound_probe(struct udevice *dev)
+{
+       return sound_find_codec_i2s(dev);
+}
+
+static int broadwell_sound_setup(struct udevice *dev)
+{
+       struct sound_uc_priv *uc_priv = dev_get_uclass_priv(dev);
+       struct i2s_uc_priv *i2c_priv = dev_get_uclass_priv(uc_priv->i2s);
+       int ret;
+
+       if (uc_priv->setup_done)
+               return -EALREADY;
+       ret = audio_codec_set_params(uc_priv->codec, i2c_priv->id,
+                                    i2c_priv->samplingrate,
+                                    i2c_priv->samplingrate * i2c_priv->rfs,
+                                    i2c_priv->bitspersample,
+                                    i2c_priv->channels);
+       if (ret)
+               return ret;
+       uc_priv->setup_done = true;
+
+       return 0;
+}
+
+static int broadwell_sound_play(struct udevice *dev, void *data, uint data_size)
+{
+       struct sound_uc_priv *uc_priv = dev_get_uclass_priv(dev);
+
+       return i2s_tx_data(uc_priv->i2s, data, data_size);
+}
+
+static const struct sound_ops broadwell_sound_ops = {
+       .setup          = broadwell_sound_setup,
+       .play           = broadwell_sound_play,
+};
+
+static const struct udevice_id broadwell_sound_ids[] = {
+       { .compatible = "google,samus-sound" },
+       { }
+};
+
+U_BOOT_DRIVER(broadwell_sound_drv) = {
+       .name           = "broadwell_sound",
+       .id             = UCLASS_SOUND,
+       .of_match       = broadwell_sound_ids,
+       .probe          = broadwell_sound_probe,
+       .ops            = &broadwell_sound_ops,
+};