dm: sound: samsung: Rename i2stx_info to samsung_i2s_priv

[oweals/u-boot.git] / drivers / sound / sound-i2s.c

diff --git a/drivers/sound/sound-i2s.c b/drivers/sound/sound-i2s.c
index be69fb0b010b036f8a439b48aacfe2d574a07f60..106842a23db1bbe0cb011e87cd4b17930fb5121d 100644 (file)
--- a/drivers/sound/sound-i2s.c
+++ b/drivers/sound/sound-i2s.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012 Samsung Electronics
  * R. Chandrasekar <rcsekar@samsung.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <malloc.h>
@@ -21,15 +20,15 @@
 #define SOUND_400_HZ 400
 #define SOUND_BITS_IN_BYTE 8
 
-static struct i2stx_info g_i2stx_pri;
+static struct samsung_i2s_priv g_i2stx_pri;
 
 /*
  * get_sound_i2s_values gets values for i2s parameters
  *
- * @param i2stx_info   i2s transmitter transfer param structure
+ * @param samsung_i2s_priv     i2s transmitter transfer param structure
  * @param blob         FDT blob if enabled else NULL
  */
-static int get_sound_i2s_values(struct i2stx_info *i2s, const void *blob)
+static int get_sound_i2s_values(struct samsung_i2s_priv *i2s, const void *blob)
 {
        int node;
        int error = 0;
@@ -98,7 +97,7 @@ static int get_sound_i2s_values(struct i2stx_info *i2s, const void *blob)
  * @param pi2s_tx      i2s parameters required by codec
  * @return              int value, 0 for success
  */
-static int codec_init(const void *blob, struct i2stx_info *pi2s_tx)
+static int codec_init(const void *blob, struct samsung_i2s_priv *pi2s_tx)
 {
        int ret;
        const char *codectype;
@@ -146,7 +145,7 @@ static int codec_init(const void *blob, struct i2stx_info *pi2s_tx)
 int sound_init(const void *blob)
 {
        int ret;
-       struct i2stx_info *pi2s_tx = &g_i2stx_pri;
+       struct samsung_i2s_priv *pi2s_tx = &g_i2stx_pri;
 
        /* Get the I2S Values */
        if (get_sound_i2s_values(pi2s_tx, blob) < 0) {
@@ -186,7 +185,8 @@ int sound_play(uint32_t msec, uint32_t frequency)
                return -1;
        }
 
-       sound_create_square_wave((unsigned short *)data,
+       sound_create_square_wave(g_i2stx_pri.samplingrate,
+                                (unsigned short *)data,
                                 data_size / sizeof(unsigned short),
                                 frequency);