drivers: most: add ALSA sound driver

This patch moves the ALSA sound driver out of the staging area and adds it
to the stable part of the MOST driver. Modifications to the Makefiles and
Kconfigs are done accordingly to not break the build.

Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Link: https://lore.kernel.org/r/1612865627-29950-1-git-send-email-christian.gromm@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/most/Kconfig b/drivers/most/Kconfig
index ebfe84e69715d5433c597912bc421ef2a03c8327..4b8145b9e7ad510966a597d145138b7efdbbbf1f 100644 (file)
--- a/drivers/most/Kconfig
+++ b/drivers/most/Kconfig
@@ -32,4 +32,14 @@ config MOST_CDEV
 
          To compile this driver as a module, choose M here: the
          module will be called most_cdev.
+
+config MOST_SND
+       tristate "Sound"
+       depends on SND
+       select SND_PCM
+       help
+         Say Y here if you want to commumicate via ALSA/sound devices.
+
+         To compile this driver as a module, choose M here: the
+         module will be called most_sound.
 endif

diff --git a/drivers/most/Makefile b/drivers/most/Makefile
index 8b53ca46633f14b2408ae198e2cb31a24010037c..60db6cd3787af3127af7b2db7f68e82c41ee7f8a 100644 (file)
--- a/drivers/most/Makefile
+++ b/drivers/most/Makefile
@@ -5,3 +5,4 @@ most_core-y :=  core.o \
 
 obj-$(CONFIG_MOST_USB_HDM) += most_usb.o
 obj-$(CONFIG_MOST_CDEV) += most_cdev.o
+obj-$(CONFIG_MOST_SND) += most_snd.o

diff --git a/drivers/staging/most/sound/sound.c b/drivers/most/most_snd.c
similarity index 100%
rename from drivers/staging/most/sound/sound.c
rename to drivers/most/most_snd.c

diff --git a/drivers/staging/most/Kconfig b/drivers/staging/most/Kconfig
index 535e6dec3504d45402b404fe552570ee724feb3d..6f420cbcdcfff67f02db4a47e3d587dee8a22151 100644 (file)
--- a/drivers/staging/most/Kconfig
+++ b/drivers/staging/most/Kconfig
@@ -20,8 +20,6 @@ if MOST_COMPONENTS
 
 source "drivers/staging/most/net/Kconfig"
 
-source "drivers/staging/most/sound/Kconfig"
-
 source "drivers/staging/most/video/Kconfig"
 
 source "drivers/staging/most/dim2/Kconfig"

diff --git a/drivers/staging/most/Makefile b/drivers/staging/most/Makefile
index be94673209f5f3ee74d569d92b7c263374c5f2c7..8b3fc5a7af5148d520ae5cfb3a0e4bdbf14fe3c3 100644 (file)
--- a/drivers/staging/most/Makefile
+++ b/drivers/staging/most/Makefile
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_MOST_NET) += net/
-obj-$(CONFIG_MOST_SOUND)       += sound/
 obj-$(CONFIG_MOST_VIDEO)       += video/
 obj-$(CONFIG_MOST_DIM2)        += dim2/
 obj-$(CONFIG_MOST_I2C) += i2c/

diff --git a/drivers/staging/most/sound/Kconfig b/drivers/staging/most/sound/Kconfig
deleted file mode 100644 (file)
index ad9f782..0000000
--- a/drivers/staging/most/sound/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# MOST ALSA configuration
-#
-
-config MOST_SOUND
-       tristate "Sound"
-       depends on SND
-       select SND_PCM
-       help
-         Say Y here if you want to commumicate via ALSA/sound devices.
-
-         To compile this driver as a module, choose M here: the
-         module will be called most_sound.

diff --git a/drivers/staging/most/sound/Makefile b/drivers/staging/most/sound/Makefile
deleted file mode 100644 (file)
index f0cd9d8..0000000
--- a/drivers/staging/most/sound/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_MOST_SOUND) += most_sound.o
-
-most_sound-objs := sound.o