Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25e5a744 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/tegra' into tmp

parents e61c0924 0af18c5c

sound/soc/tegra/tegra20_i2s.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 


#define TEGRA20_I2S_TIMING_NON_SYM_ENABLE		(1 << 12)

#define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT	0

#define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US	0x7fff

#define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US	0x7ff

#define TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK	(TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US << TEGRA20_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT)



/* Fields in TEGRA20_I2S_FIFO_SCR */

sound/soc/tegra/tegra30_i2s.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 


#define TEGRA30_I2S_TIMING_NON_SYM_ENABLE		(1 << 12)

#define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT	0

#define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US	0x7fff

#define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US	0x7ff

#define TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK	(TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_MASK_US << TEGRA30_I2S_TIMING_CHANNEL_BIT_COUNT_SHIFT)



/* Fields in TEGRA30_I2S_OFFSET */