diff options
| author | Mark A. Greer <mgreer@animalcreek.com> | 2015-05-21 22:56:56 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2015-05-23 23:26:41 (GMT) |
| commit | 34aa7e1cadef05f9494ff1f0c4977e762d9f32fa (patch) | |
| tree | baec956fead73ff5e652626cca4df6cd269218f8 /drivers/staging/greybus/audio.c | |
| parent | 555a0645b17114c559a2079ed64a8edb079b2339 (diff) | |
| download | linux-34aa7e1cadef05f9494ff1f0c4977e762d9f32fa.tar.xz | |
greybus: gb-audio: Clean up codec name generation
Instead of using the fixed suffix, '6-001b', in the
codec name, generate it from the I2S adapter number
and I2C address of the codec.
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Acked-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/audio.c')
| -rw-r--r-- | drivers/staging/greybus/audio.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/greybus/audio.c b/drivers/staging/greybus/audio.c index 232ba94..3e8c242 100644 --- a/drivers/staging/greybus/audio.c +++ b/drivers/staging/greybus/audio.c @@ -19,6 +19,9 @@ #define GB_AUDIO_DATA_DRIVER_NAME "gb_audio_data" #define GB_AUDIO_MGMT_DRIVER_NAME "gb_audio_mgmt" +#define RT5647_I2C_ADAPTER_NR 6 +#define RT5647_I2C_ADDR 0x1b + /* * gb_snd management functions */ @@ -111,7 +114,8 @@ static struct asoc_simple_card_info *setup_card_info(int device_count) #endif #if USE_RT5645 obj->card_info.daifmt = GB_FMTS; - sprintf(obj->codec_name, "rt5645.%s", "6-001b"); /* XXX do i2c bus addr dynamically */ + sprintf(obj->codec_name, "rt5645.%d-%04x", RT5647_I2C_ADAPTER_NR, + RT5647_I2C_ADDR); obj->card_info.codec_dai.name = "rt5645-aif1"; obj->card_info.codec_dai.fmt = SND_SOC_DAIFMT_CBM_CFM; obj->card_info.codec_dai.sysclk = 12288000; |