usb: dwc3: Include device_compat.h in dwc3-octeon-glue.c

[pandora-u-boot.git] / cmd / sound.c

diff --git a/cmd/sound.c b/cmd/sound.c
index f5dd8bc..7fc1967 100644 (file)
--- a/cmd/sound.c
+++ b/cmd/sound.c
@@ -1,25 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012 Samsung Electronics
  * Rajeshwari Shinde <rajeshwari.s@samsung.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
+#include <dm.h>
 #include <fdtdec.h>
 #include <sound.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 /* Initilaise sound subsystem */
-static int do_init(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_init(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
+       struct udevice *dev;
        int ret;
 
-       ret = sound_init(gd->fdt_blob);
+       ret = uclass_first_device_err(UCLASS_SOUND, &dev);
+       if (!ret)
+               ret = sound_setup(dev);
        if (ret) {
-               printf("Initialise Audio driver failed\n");
+               printf("Initialise Audio driver failed (ret=%d)\n", ret);
                return CMD_RET_FAILURE;
        }
 
@@ -27,8 +31,10 @@ static int do_init(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 }
 
 /* play sound from buffer */
-static int do_play(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_play(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
+       struct udevice *dev;
        int ret = 0;
        int msec = 1000;
        int freq = 400;
@@ -38,24 +44,27 @@ static int do_play(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        if (argc > 2)
                freq = simple_strtoul(argv[2], NULL, 10);
 
-       ret = sound_play(msec, freq);
+       ret = uclass_first_device_err(UCLASS_SOUND, &dev);
+       if (!ret)
+               ret = sound_beep(dev, msec, freq);
        if (ret) {
-               printf("play failed");
+               printf("Sound device failed to play (err=%d)\n", ret);
                return CMD_RET_FAILURE;
        }
 
        return 0;
 }
 
-static cmd_tbl_t cmd_sound_sub[] = {
+static struct cmd_tbl cmd_sound_sub[] = {
        U_BOOT_CMD_MKENT(init, 0, 1, do_init, "", ""),
        U_BOOT_CMD_MKENT(play, 2, 1, do_play, "", ""),
 };
 
 /* process sound command */
-static int do_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_sound(struct cmd_tbl *cmdtp, int flag, int argc,
+                   char *const argv[])
 {
-       cmd_tbl_t *c;
+       struct cmd_tbl *c;
 
        if (argc < 1)
                return CMD_RET_USAGE;