dm: sound: Use the correct number of channels for sound

At present the 'beep' sound generates a waveform for only one channel even
if two are being used. This means that the beep is twice the frequency it
should be. Correct this by making it a parameter.

The fix in a previous commit was correct for sandbox but not for other
boards.

Fixes: 03f11e87a8 ("sound: Correct data output in sound_create_square_wave()")
Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/sound/sound-uclass.c b/drivers/sound/sound-uclass.c
index 71e753cb99311803872e25ce85c3a29aaa54d64b..2b836268896e1b962497b10b29ffcd18da09c86b 100644 (file)
--- a/drivers/sound/sound-uclass.c
+++ b/drivers/sound/sound-uclass.c
@@ -53,7 +53,7 @@ int sound_beep(struct udevice *dev, int msecs, int frequency_hz)
        }
 
        sound_create_square_wave(i2s_uc_priv->samplingrate, data, data_size,
-                                frequency_hz);
+                                frequency_hz, i2s_uc_priv->channels);
 
        while (msecs >= 1000) {
                ret = sound_play(dev, data, data_size);

diff --git a/drivers/sound/sound.c b/drivers/sound/sound.c
index 4f0ad0d8f0d706f4bd0881e878341f37a388f414..dd3f9db4f7547da4b45491eb44e8dd906062e504 100644 (file)
--- a/drivers/sound/sound.c
+++ b/drivers/sound/sound.c
@@ -8,7 +8,7 @@
 #include <sound.h>
 
 void sound_create_square_wave(uint sample_rate, unsigned short *data, int size,
-                             uint freq)
+                             uint freq, uint channels)
 {
        const unsigned short amplitude = 16000; /* between 1 and 32767 */
        const int period = freq ? sample_rate / freq : 0;
@@ -21,14 +21,17 @@ void sound_create_square_wave(uint sample_rate, unsigned short *data, int size,
                size--;
 
        while (size) {
-               int i;
+               int i, j;
+
                for (i = 0; size && i < half; i++) {
                        size -= 2;
-                       *data++ = amplitude;
+                       for (j = 0; j < channels; j++)
+                               *data++ = amplitude;
                }
                for (i = 0; size && i < period - half; i++) {
                        size -= 2;
-                       *data++ = -amplitude;
+                       for (j = 0; j < channels; j++)
+                               *data++ = -amplitude;
                }
        }
 }

diff --git a/include/sound.h b/include/sound.h
index 02acefd34f0946c82e20faa47c994a40bc9a3630..b7959cc260751da14009146858c3b0b4e1def955 100644 (file)
--- a/include/sound.h
+++ b/include/sound.h
@@ -37,13 +37,14 @@ struct sound_uc_priv {
 /**
  * Generates square wave sound data for 1 second
  *
- * @param sample_rate   Sample rate in Hz
- * @param data          data buffer pointer
- * @param size          size of the buffer in bytes
- * @param freq          frequency of the wave
+ * @sample_rate: Sample rate in Hz
+ * @data: data buffer pointer
+ * @size: size of the buffer in bytes
+ * @freq: frequency of the wave
+ * @channels: Number of channels to use
  */
 void sound_create_square_wave(uint sample_rate, unsigned short *data, int size,
-                             uint freq);
+                             uint freq, uint channels);
 
 /*
  * The sound uclass brings together a data transport (currently only I2C) and a