greybus: audio: Build audio module conditionally

Added CONFIG_XXX flag check before compiling audio module.
Once we add dynamic DAI link registration from audio driver,
this check wil be required to avoid compilation failures with
other kernel revisions.

Also, renamed header file to better align with .c file name.

Signed-off-by: Vaibhav Agarwal <vaibhav.agarwal@linaro.org>
Signed-off-by: Mark Greer <mgreer@animalcreek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index 4ebdc6b9c89f307e25f4182bd8a278be475db926..6759d684027ccc83048980038225cd4eb6d5e6ed 100644 (file)
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -47,6 +47,9 @@ obj-m += gb-raw.o
 obj-m += gb-es2.o
 obj-m += gb-arche.o
 obj-m += gb-audio-codec.o
+ifeq ($(CONFIG_SND_SOC_DYNAMIC_DAILINK),y)
+ obj-m += gb-audio-codec.o
+endif
 obj-m += gb-camera.o
 obj-m += gb-audio-gb.o
 obj-m += gb-audio-apbridgea.o

diff --git a/drivers/staging/greybus/audio.h b/drivers/staging/greybus/audio.h
deleted file mode 100644 (file)
index fca60af..0000000
--- a/drivers/staging/greybus/audio.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Greybus audio driver
- * Copyright 2015 Google Inc.
- * Copyright 2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
- */
-
-#ifndef __LINUX_GBAUDIO_H
-#define __LINUX_GBAUDIO_H
-
-#ifdef __KERNEL__
-
-#include <sound/soc.h>
-
-#include "greybus.h"
-#include "greybus_protocols.h"
-
-#define NAME_SIZE      32
-
-enum {
-       APB1_PCM = 0,
-       APB2_PCM,
-       NUM_CODEC_DAIS,
-};
-
-enum gbcodec_reg_index {
-       GBCODEC_CTL_REG,
-       GBCODEC_MUTE_REG,
-       GBCODEC_PB_LVOL_REG,
-       GBCODEC_PB_RVOL_REG,
-       GBCODEC_CAP_LVOL_REG,
-       GBCODEC_CAP_RVOL_REG,
-       GBCODEC_APB1_MUX_REG,
-       GBCODEC_APB2_MUX_REG,
-       GBCODEC_REG_COUNT
-};
-
-/* bit 0-SPK, 1-HP, 2-DAC,
- * 4-MIC, 5-HSMIC, 6-MIC2
- */
-#define GBCODEC_CTL_REG_DEFAULT                0x00
-
-/* bit 0,1 - APB1-PB-L/R
- * bit 2,3 - APB2-PB-L/R
- * bit 4,5 - APB1-Cap-L/R
- * bit 6,7 - APB2-Cap-L/R
- */
-#define        GBCODEC_MUTE_REG_DEFAULT        0x00
-
-/* 0-127 steps */
-#define        GBCODEC_PB_VOL_REG_DEFAULT      0x00
-#define        GBCODEC_CAP_VOL_REG_DEFAULT     0x00
-
-/* bit 0,1,2 - PB stereo, left, right
- * bit 8,9,10 - Cap stereo, left, right
- */
-#define GBCODEC_APB1_MUX_REG_DEFAULT   0x00
-#define GBCODEC_APB2_MUX_REG_DEFAULT   0x00
-
-static const u8 gbcodec_reg_defaults[GBCODEC_REG_COUNT] = {
-       GBCODEC_CTL_REG_DEFAULT,
-       GBCODEC_MUTE_REG_DEFAULT,
-       GBCODEC_PB_VOL_REG_DEFAULT,
-       GBCODEC_PB_VOL_REG_DEFAULT,
-       GBCODEC_CAP_VOL_REG_DEFAULT,
-       GBCODEC_CAP_VOL_REG_DEFAULT,
-       GBCODEC_APB1_MUX_REG_DEFAULT,
-       GBCODEC_APB2_MUX_REG_DEFAULT,
-};
-
-struct gbaudio_codec_info {
-       struct snd_soc_codec *codec;
-
-       bool usable;
-       u8 reg[GBCODEC_REG_COUNT];
-       int registered;
-
-       int num_kcontrols;
-       int num_dapm_widgets;
-       int num_dapm_routes;
-       struct snd_kcontrol_new *kctls;
-       struct snd_soc_dapm_widget *widgets;
-       struct snd_soc_dapm_route *routes;
-       struct mutex lock;
-};
-
-extern int gb_audio_gb_get_topology(struct gb_connection *connection,
-                                   struct gb_audio_topology **topology);
-extern int gb_audio_gb_get_control(struct gb_connection *connection,
-                                  uint8_t control_id, uint8_t index,
-                                  struct gb_audio_ctl_elem_value *value);
-extern int gb_audio_gb_set_control(struct gb_connection *connection,
-                                  uint8_t control_id, uint8_t index,
-                                  struct gb_audio_ctl_elem_value *value);
-extern int gb_audio_gb_enable_widget(struct gb_connection *connection,
-                                    uint8_t widget_id);
-extern int gb_audio_gb_disable_widget(struct gb_connection *connection,
-                                     uint8_t widget_id);
-extern int gb_audio_gb_get_pcm(struct gb_connection *connection,
-                              uint16_t data_cport, uint32_t *format,
-                              uint32_t *rate, uint8_t *channels,
-                              uint8_t *sig_bits);
-extern int gb_audio_gb_set_pcm(struct gb_connection *connection,
-                              uint16_t data_cport, uint32_t format,
-                              uint32_t rate, uint8_t channels,
-                              uint8_t sig_bits);
-extern int gb_audio_gb_set_tx_data_size(struct gb_connection *connection,
-                                       uint16_t data_cport, uint16_t size);
-extern int gb_audio_gb_get_tx_delay(struct gb_connection *connection,
-                                   uint16_t data_cport, uint32_t *delay);
-extern int gb_audio_gb_activate_tx(struct gb_connection *connection,
-                                  uint16_t data_cport);
-extern int gb_audio_gb_deactivate_tx(struct gb_connection *connection,
-                                    uint16_t data_cport);
-extern int gb_audio_gb_set_rx_data_size(struct gb_connection *connection,
-                                       uint16_t data_cport, uint16_t size);
-extern int gb_audio_gb_get_rx_delay(struct gb_connection *connection,
-                                   uint16_t data_cport, uint32_t *delay);
-extern int gb_audio_gb_activate_rx(struct gb_connection *connection,
-                                  uint16_t data_cport);
-extern int gb_audio_gb_deactivate_rx(struct gb_connection *connection,
-                                    uint16_t data_cport);
-extern int gb_audio_apbridgea_set_config(struct gb_connection *connection,
-                                        __u16 i2s_port, __u32 format,
-                                        __u32 rate, __u32 mclk_freq);
-extern int gb_audio_apbridgea_register_cport(struct gb_connection *connection,
-                                            __u16 i2s_port, __u16 cportid);
-extern int gb_audio_apbridgea_unregister_cport(struct gb_connection *connection,
-                                              __u16 i2s_port, __u16 cportid);
-extern int gb_audio_apbridgea_set_tx_data_size(struct gb_connection *connection,
-                                              __u16 i2s_port, __u16 size);
-extern int gb_audio_apbridgea_get_tx_delay(struct gb_connection *connection,
-                                          __u16 i2s_port, __u32 *delay);
-extern int gb_audio_apbridgea_start_tx(struct gb_connection *connection,
-                                      __u16 i2s_port, __u64 timestamp);
-extern int gb_audio_apbridgea_stop_tx(struct gb_connection *connection,
-                                     __u16 i2s_port);
-extern int gb_audio_apbridgea_set_rx_data_size(struct gb_connection *connection,
-                                              __u16 i2s_port, __u16 size);
-extern int gb_audio_apbridgea_get_rx_delay(struct gb_connection *connection,
-                                          __u16 i2s_port, __u32 *delay);
-extern int gb_audio_apbridgea_start_rx(struct gb_connection *connection,
-                                      __u16 i2s_port);
-extern int gb_audio_apbridgea_stop_rx(struct gb_connection *connection,
-                                     __u16 i2s_port);
-
-#endif /* __KERNEL__ */
-#endif /* __LINUX_GBAUDIO_H */

diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c
index 2bc23095ffd0cb7a81647a28e6aa07aad1b5c5f4..826604ae64df5d105e049fea0ea1ac387464aa97 100644 (file)
--- a/drivers/staging/greybus/audio_codec.c
+++ b/drivers/staging/greybus/audio_codec.c
@@ -7,7 +7,7 @@
  */
 #include <linux/module.h>
 
-#include "audio.h"
+#include "audio_codec.h"
 
 static int gbcodec_event_spk(struct snd_soc_dapm_widget *w,
                                        struct snd_kcontrol *k, int event)

diff --git a/drivers/staging/greybus/audio_codec.h b/drivers/staging/greybus/audio_codec.h
new file mode 100644 (file)
index 0000000..f8597b3
--- /dev/null
+++ b/drivers/staging/greybus/audio_codec.h
@@ -0,0 +1,146 @@
+/*
+ * Greybus audio driver
+ * Copyright 2015 Google Inc.
+ * Copyright 2015 Linaro Ltd.
+ *
+ * Released under the GPLv2 only.
+ */
+
+#ifndef __LINUX_GBAUDIO_CODEC_H
+#define __LINUX_GBAUDIO_CODEC_H
+
+#include <sound/soc.h>
+
+#include "greybus.h"
+#include "greybus_protocols.h"
+
+#define NAME_SIZE      32
+
+enum {
+       APB1_PCM = 0,
+       APB2_PCM,
+       NUM_CODEC_DAIS,
+};
+
+enum gbcodec_reg_index {
+       GBCODEC_CTL_REG,
+       GBCODEC_MUTE_REG,
+       GBCODEC_PB_LVOL_REG,
+       GBCODEC_PB_RVOL_REG,
+       GBCODEC_CAP_LVOL_REG,
+       GBCODEC_CAP_RVOL_REG,
+       GBCODEC_APB1_MUX_REG,
+       GBCODEC_APB2_MUX_REG,
+       GBCODEC_REG_COUNT
+};
+
+/* bit 0-SPK, 1-HP, 2-DAC,
+ * 4-MIC, 5-HSMIC, 6-MIC2
+ */
+#define GBCODEC_CTL_REG_DEFAULT                0x00
+
+/* bit 0,1 - APB1-PB-L/R
+ * bit 2,3 - APB2-PB-L/R
+ * bit 4,5 - APB1-Cap-L/R
+ * bit 6,7 - APB2-Cap-L/R
+ */
+#define        GBCODEC_MUTE_REG_DEFAULT        0x00
+
+/* 0-127 steps */
+#define        GBCODEC_PB_VOL_REG_DEFAULT      0x00
+#define        GBCODEC_CAP_VOL_REG_DEFAULT     0x00
+
+/* bit 0,1,2 - PB stereo, left, right
+ * bit 8,9,10 - Cap stereo, left, right
+ */
+#define GBCODEC_APB1_MUX_REG_DEFAULT   0x00
+#define GBCODEC_APB2_MUX_REG_DEFAULT   0x00
+
+static const u8 gbcodec_reg_defaults[GBCODEC_REG_COUNT] = {
+       GBCODEC_CTL_REG_DEFAULT,
+       GBCODEC_MUTE_REG_DEFAULT,
+       GBCODEC_PB_VOL_REG_DEFAULT,
+       GBCODEC_PB_VOL_REG_DEFAULT,
+       GBCODEC_CAP_VOL_REG_DEFAULT,
+       GBCODEC_CAP_VOL_REG_DEFAULT,
+       GBCODEC_APB1_MUX_REG_DEFAULT,
+       GBCODEC_APB2_MUX_REG_DEFAULT,
+};
+
+struct gbaudio_codec_info {
+       struct snd_soc_codec *codec;
+
+       bool usable;
+       u8 reg[GBCODEC_REG_COUNT];
+       int registered;
+
+       int num_kcontrols;
+       int num_dapm_widgets;
+       int num_dapm_routes;
+       struct snd_kcontrol_new *kctls;
+       struct snd_soc_dapm_widget *widgets;
+       struct snd_soc_dapm_route *routes;
+       struct mutex lock;
+};
+
+extern int gb_audio_gb_get_topology(struct gb_connection *connection,
+                                   struct gb_audio_topology **topology);
+extern int gb_audio_gb_get_control(struct gb_connection *connection,
+                                  uint8_t control_id, uint8_t index,
+                                  struct gb_audio_ctl_elem_value *value);
+extern int gb_audio_gb_set_control(struct gb_connection *connection,
+                                  uint8_t control_id, uint8_t index,
+                                  struct gb_audio_ctl_elem_value *value);
+extern int gb_audio_gb_enable_widget(struct gb_connection *connection,
+                                    uint8_t widget_id);
+extern int gb_audio_gb_disable_widget(struct gb_connection *connection,
+                                     uint8_t widget_id);
+extern int gb_audio_gb_get_pcm(struct gb_connection *connection,
+                              uint16_t data_cport, uint32_t *format,
+                              uint32_t *rate, uint8_t *channels,
+                              uint8_t *sig_bits);
+extern int gb_audio_gb_set_pcm(struct gb_connection *connection,
+                              uint16_t data_cport, uint32_t format,
+                              uint32_t rate, uint8_t channels,
+                              uint8_t sig_bits);
+extern int gb_audio_gb_set_tx_data_size(struct gb_connection *connection,
+                                       uint16_t data_cport, uint16_t size);
+extern int gb_audio_gb_get_tx_delay(struct gb_connection *connection,
+                                   uint16_t data_cport, uint32_t *delay);
+extern int gb_audio_gb_activate_tx(struct gb_connection *connection,
+                                  uint16_t data_cport);
+extern int gb_audio_gb_deactivate_tx(struct gb_connection *connection,
+                                    uint16_t data_cport);
+extern int gb_audio_gb_set_rx_data_size(struct gb_connection *connection,
+                                       uint16_t data_cport, uint16_t size);
+extern int gb_audio_gb_get_rx_delay(struct gb_connection *connection,
+                                   uint16_t data_cport, uint32_t *delay);
+extern int gb_audio_gb_activate_rx(struct gb_connection *connection,
+                                  uint16_t data_cport);
+extern int gb_audio_gb_deactivate_rx(struct gb_connection *connection,
+                                    uint16_t data_cport);
+extern int gb_audio_apbridgea_set_config(struct gb_connection *connection,
+                                        __u16 i2s_port, __u32 format,
+                                        __u32 rate, __u32 mclk_freq);
+extern int gb_audio_apbridgea_register_cport(struct gb_connection *connection,
+                                            __u16 i2s_port, __u16 cportid);
+extern int gb_audio_apbridgea_unregister_cport(struct gb_connection *connection,
+                                              __u16 i2s_port, __u16 cportid);
+extern int gb_audio_apbridgea_set_tx_data_size(struct gb_connection *connection,
+                                              __u16 i2s_port, __u16 size);
+extern int gb_audio_apbridgea_get_tx_delay(struct gb_connection *connection,
+                                          __u16 i2s_port, __u32 *delay);
+extern int gb_audio_apbridgea_start_tx(struct gb_connection *connection,
+                                      __u16 i2s_port, __u64 timestamp);
+extern int gb_audio_apbridgea_stop_tx(struct gb_connection *connection,
+                                     __u16 i2s_port);
+extern int gb_audio_apbridgea_set_rx_data_size(struct gb_connection *connection,
+                                              __u16 i2s_port, __u16 size);
+extern int gb_audio_apbridgea_get_rx_delay(struct gb_connection *connection,
+                                          __u16 i2s_port, __u32 *delay);
+extern int gb_audio_apbridgea_start_rx(struct gb_connection *connection,
+                                      __u16 i2s_port);
+extern int gb_audio_apbridgea_stop_rx(struct gb_connection *connection,
+                                     __u16 i2s_port);
+
+#endif /* __LINUX_GBAUDIO_CODEC_H */