diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-07 01:29:39 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-07 01:29:39 -0500 |
| commit | 25e5a7441fa09a08283fe83e507d8eb47150ccd8 (patch) | |
| tree | a514f0aa9dabae2471fd4d9a033bf2f80d54e353 /sound | |
| parent | e61c09249a39c0133bd5553576162ab2a56c6d43 (diff) | |
| parent | 0af18c5cc9403999bb189f825b816f7fc80fc0ee (diff) | |
Merge remote-tracking branch 'asoc/fix/tegra' into tmp
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra20_i2s.h | 2 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra30_i2s.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra20_i2s.h b/sound/soc/tegra/tegra20_i2s.h index c27069d24d77..729958713cd4 100644 --- a/sound/soc/tegra/tegra20_i2s.h +++ b/sound/soc/tegra/tegra20_i2s.h | |||
| @@ -121,7 +121,7 @@ | |||
| 121 | 121 | ||
| 122 | #define TEGRA20_I2S_TIMING_NON_SYM_ENABLE (1 << 12) | 122 | #define TEGRA20_I2S_TIMING_NON_SYM_ENABLE (1 << 12) |
| 123 | #define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT 0 | 123 | #define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT 0 |
| 124 | #define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US 0x7fff | 124 | #define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US 0x7ff |
| 125 | #define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK (TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US << TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT) | 125 | #define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK (TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US << TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT) |
| 126 | 126 | ||
| 127 | /* Fields in TEGRA20_I2S_FIFO_SCR */ | 127 | /* Fields in TEGRA20_I2S_FIFO_SCR */ |
diff --git a/sound/soc/tegra/tegra30_i2s.h b/sound/soc/tegra/tegra30_i2s.h index 34dc47b9581c..a294d942b9f7 100644 --- a/sound/soc/tegra/tegra30_i2s.h +++ b/sound/soc/tegra/tegra30_i2s.h | |||
| @@ -110,7 +110,7 @@ | |||
| 110 | 110 | ||
| 111 | #define TEGRA30_I2S_TIMING_NON_SYM_ENABLE (1 << 12) | 111 | #define TEGRA30_I2S_TIMING_NON_SYM_ENABLE (1 << 12) |
| 112 | #define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT 0 | 112 | #define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT 0 |
| 113 | #define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US 0x7fff | 113 | #define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US 0x7ff |
| 114 | #define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK (TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US << TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT) | 114 | #define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK (TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US << TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT) |
| 115 | 115 | ||
| 116 | /* Fields in TEGRA30_I2S_OFFSET */ | 116 | /* Fields in TEGRA30_I2S_OFFSET */ |