diff options
| author | Simon Glass <sjg@chromium.org> | 2018-12-10 10:37:38 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2018-12-13 16:32:49 -0700 |
| commit | 6c986cfef4a104ad39faf381014b7c315984cab8 (patch) | |
| tree | 89ff78727605b00a24bc9a6f17b3ef9827e0c25a /drivers/sound | |
| parent | a1b17e4f4c820c5ffe77ffa0c716e8b3b5d69866 (diff) | |
dm: sound: Start i2c IDs from 0
The current ID enums start from 1 but there does not seem to be any reason
that they cannot start with 0. Adjust the code to avoid the +1 in
codec_init().
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/sound')
| -rw-r--r-- | drivers/sound/max98095.h | 2 | ||||
| -rw-r--r-- | drivers/sound/sound-i2s.c | 6 | ||||
| -rw-r--r-- | drivers/sound/wm8994.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/drivers/sound/max98095.h b/drivers/sound/max98095.h index 44b1e3a97b..13ae177a86 100644 --- a/drivers/sound/max98095.h +++ b/drivers/sound/max98095.h @@ -13,7 +13,7 @@ /* Available audio interface ports in wm8994 codec */ enum en_max_audio_interface { - AIF1 = 1, + AIF1, AIF2, }; diff --git a/drivers/sound/sound-i2s.c b/drivers/sound/sound-i2s.c index ed130750b2..a2fc78154f 100644 --- a/drivers/sound/sound-i2s.c +++ b/drivers/sound/sound-i2s.c @@ -120,13 +120,11 @@ static int codec_init(const void *blob, struct i2s_uc_priv *pi2s_tx) debug("device = %s\n", codectype); if (!strcmp(codectype, "wm8994")) { /* Check the codec type and initialise the same */ - ret = wm8994_init(blob, pi2s_tx->id + 1, - pi2s_tx->samplingrate, + ret = wm8994_init(blob, pi2s_tx->id, pi2s_tx->samplingrate, (pi2s_tx->samplingrate * (pi2s_tx->rfs)), pi2s_tx->bitspersample, pi2s_tx->channels); } else if (!strcmp(codectype, "max98095")) { - ret = max98095_init(blob, pi2s_tx->id + 1, - pi2s_tx->samplingrate, + ret = max98095_init(blob, pi2s_tx->id, pi2s_tx->samplingrate, (pi2s_tx->samplingrate * (pi2s_tx->rfs)), pi2s_tx->bitspersample); } else { diff --git a/drivers/sound/wm8994.h b/drivers/sound/wm8994.h index ef2878f87c..e36e6269f0 100644 --- a/drivers/sound/wm8994.h +++ b/drivers/sound/wm8994.h @@ -15,7 +15,7 @@ /* Avilable audi interface ports in wm8994 codec */ enum en_audio_interface { - WM8994_AIF1 = 1, + WM8994_AIF1, WM8994_AIF2, WM8994_AIF3 }; |