/*
 * max98371.h -- MAX98371 ALSA SoC Audio driver
 *
 * Copyright 2011-2012 Maxim Integrated Products
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 */

#ifndef _MAX98371_H
#define _MAX98371_H

#define MAX98371_IRQ_CLEAR1			0x01
#define MAX98371_IRQ_CLEAR2			0x02
#define MAX98371_IRQ_CLEAR3			0x03
#define MAX98371_DAI_CLK			0x10
#define MAX98371_DAI_BSEL_MASK			0xF
#define MAX98371_DAI_BSEL_32			2
#define MAX98371_DAI_BSEL_48			3
#define MAX98371_DAI_BSEL_64			4
#define MAX98371_SPK_SR				0x11
#define MAX98371_SPK_SR_MASK			0xF
#define MAX98371_SPK_SR_32			6
#define MAX98371_SPK_SR_44			7
#define MAX98371_SPK_SR_48			8
#define MAX98371_SPK_SR_88			10
#define MAX98371_SPK_SR_96			11
#define MAX98371_DAI_CHANNEL			0x15
#define MAX98371_CHANNEL_MASK			0x3
#define MAX98371_MONOMIX_SRC			0x18
#define MAX98371_MONOMIX_CFG			0x19
#define MAX98371_HPF				0x1C
#define MAX98371_MONOMIX_SRC_MASK		0xFF
#define MONOMIX_RX_0_1				((0x1)<<(4))
#define M98371_DAI_CHANNEL_I2S			0x3
#define MAX98371_DIGITAL_GAIN			0x2D
#define MAX98371_DIGITAL_GAIN_WIDTH		0x7
#define MAX98371_GAIN				0x2E
#define MAX98371_GAIN_SHIFT			0x4
#define MAX98371_GAIN_WIDTH			0x4
#define MAX98371_DHT_MAX_WIDTH			4
#define MAX98371_FMT				0x14
#define MAX98371_CHANSZ_WIDTH			6
#define MAX98371_FMT_MASK		        ((0x3)<<(MAX98371_CHANSZ_WIDTH))
#define MAX98371_FMT_MODE_MASK		        ((0x7)<<(3))
#define MAX98371_DAI_LEFT		        ((0x1)<<(3))
#define MAX98371_DAI_RIGHT		        ((0x2)<<(3))
#define MAX98371_DAI_CHANSZ_16                  ((1)<<(MAX98371_CHANSZ_WIDTH))
#define MAX98371_DAI_CHANSZ_24                  ((2)<<(MAX98371_CHANSZ_WIDTH))
#define MAX98371_DAI_CHANSZ_32                  ((3)<<(MAX98371_CHANSZ_WIDTH))
#define MAX98371_DHT  0x32
#define MAX98371_DHT_STEP			0x3
#define MAX98371_DHT_GAIN			0x31
#define MAX98371_DHT_GAIN_WIDTH			0x4
#define MAX98371_DHT_ROT_WIDTH			0x4
#define MAX98371_SPK_ENABLE			0x4A
#define MAX98371_GLOBAL_ENABLE			0x50
#define MAX98371_SOFT_RESET			0x51
#define MAX98371_VERSION			0xFF


struct max98371_priv {
	struct regmap *regmap;
	struct snd_soc_codec *codec;
};
#endif
'3efa70d78f218e4c9276b0bac0545e5184c1c47b'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/linux/net-next.git/commit/?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>root</a>/<a href='/cgit.cgi/linux/net-next.git/commit/sound?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>sound</a>/<a href='/cgit.cgi/linux/net-next.git/commit/sound/soc?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>soc</a>/<a href='/cgit.cgi/linux/net-next.git/commit/sound/soc/omap?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>omap</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='3efa70d78f218e4c9276b0bac0545e5184c1c47b'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>David S. Miller &lt;davem@davemloft.net&gt;</td><td class='right'>2017-02-07 16:29:30 -0500</td></tr>
<tr><th>committer</th><td>David S. Miller &lt;davem@davemloft.net&gt;</td><td class='right'>2017-02-07 16:29:30 -0500</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/sound/soc/omap?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>3efa70d78f218e4c9276b0bac0545e5184c1c47b</a> (<a href='/cgit.cgi/linux/net-next.git/patch/sound/soc/omap?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>f4abe2f05e173023d2a262afd4aebb1e89fe6985</a> /<a href='/cgit.cgi/linux/net-next.git/tree/sound/soc/omap?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>sound/soc/omap</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/sound/soc/omap?id=76e0e70e6452b971a69cc9794ff4a6715c11f7f2'>76e0e70e6452b971a69cc9794ff4a6715c11f7f2</a> (<a href='/cgit.cgi/linux/net-next.git/diff/sound/soc/omap?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&amp;id2=76e0e70e6452b971a69cc9794ff4a6715c11f7f2'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/sound/soc/omap?id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742</a> (<a href='/cgit.cgi/linux/net-next.git/diff/sound/soc/omap?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&amp;id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff</a>)</td></tr></table>
<div class='commit-subject'>Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net</div><div class='commit-msg'>The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>Diffstat</a> (limited to 'sound/soc/omap')</div><table summary='diffstat' class='diffstat'>