diff options
| author | Mark Brown | 2018-08-08 18:32:10 +0200 |
|---|---|---|
| committer | Mark Brown | 2018-08-08 18:32:10 +0200 |
| commit | 35ef57a4190d4253b73720cf0402158eda0f1bc8 (patch) | |
| tree | f7346839cbfe76beb8c09a6f0f6c5012cc28cff8 /sound/soc/tegra | |
| parent | ASoC: wm_adsp: Declare firmware controls from codec driver (diff) | |
| parent | ASoC: max98373: Added software reset register to readable registers (diff) | |
| download | kernel-qcow2-linux-35ef57a4190d4253b73720cf0402158eda0f1bc8.tar.gz kernel-qcow2-linux-35ef57a4190d4253b73720cf0402158eda0f1bc8.tar.xz kernel-qcow2-linux-35ef57a4190d4253b73720cf0402158eda0f1bc8.zip | |
Merge branch 'asoc-4.18' into asoc-4.19 wmadsp dep
Diffstat (limited to 'sound/soc/tegra')
| -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 |