diff options
| author |   Mark Brown <broonie@kernel.org> | 2018-08-09 14:46:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-09 14:46:56 +0100 |
| commit | 6c084839877666d987ff8bc4e0facd3c02d99d61 (patch) | |
| tree | 714675fae123ffbe42dd04892be2561ac34d1d8d /sound/soc/tegra/tegra30_i2s.h | |
| parent | Linux 4.18-rc8 (diff) | |
| parent | ASoC: max98373: Added software reset register to readable registers (diff) | |
| download | linux-dev-6c084839877666d987ff8bc4e0facd3c02d99d61.tar.xz linux-dev-6c084839877666d987ff8bc4e0facd3c02d99d61.zip | |
Merge branch 'asoc-4.18' into asoc-linus
Diffstat (limited to 'sound/soc/tegra/tegra30_i2s.h')
| -rw-r--r-- | sound/soc/tegra/tegra30_i2s.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra30_i2s.h b/sound/soc/tegra/tegra30_i2s.h index 774fc6ad2026..2e561e946de2 100644 --- a/sound/soc/tegra/tegra30_i2s.h +++ b/sound/soc/tegra/tegra30_i2s.h @@ -173,7 +173,7 @@ /* Number of slots in frame, minus 1 */ #define TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_SHIFT 16 #define TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_MASK_US 7 -#define TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_MASK (TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOT_MASK_US << TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOT_SHIFT) +#define TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_MASK (TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_MASK_US << TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_SHIFT) /* TDM mode slot enable bitmask */ #define TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_SHIFT 8 |