/*
 * Copyright (C) 2015 Broadcom Corporation
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation version 2.
 *
 * This program is distributed "as is" WITHOUT ANY WARRANTY of any
 * kind, whether express or implied; without even the implied warranty
 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

#define BCM2835_PLLA			0
#define BCM2835_PLLB			1
#define BCM2835_PLLC			2
#define BCM2835_PLLD			3
#define BCM2835_PLLH			4

#define BCM2835_PLLA_CORE		5
#define BCM2835_PLLA_PER		6
#define BCM2835_PLLB_ARM		7
#define BCM2835_PLLC_CORE0		8
#define BCM2835_PLLC_CORE1		9
#define BCM2835_PLLC_CORE2		10
#define BCM2835_PLLC_PER		11
#define BCM2835_PLLD_CORE		12
#define BCM2835_PLLD_PER		13
#define BCM2835_PLLH_RCAL		14
#define BCM2835_PLLH_AUX		15
#define BCM2835_PLLH_PIX		16

#define BCM2835_CLOCK_TIMER		17
#define BCM2835_CLOCK_OTP		18
#define BCM2835_CLOCK_UART		19
#define BCM2835_CLOCK_VPU		20
#define BCM2835_CLOCK_V3D		21
#define BCM2835_CLOCK_ISP		22
#define BCM2835_CLOCK_H264		23
#define BCM2835_CLOCK_VEC		24
#define BCM2835_CLOCK_HSM		25
#define BCM2835_CLOCK_SDRAM		26
#define BCM2835_CLOCK_TSENS		27
#define BCM2835_CLOCK_EMMC		28
#define BCM2835_CLOCK_PERI_IMAGE	29
#define BCM2835_CLOCK_PWM		30
#define BCM2835_CLOCK_PCM		31

#define BCM2835_PLLA_DSI0		32
#define BCM2835_PLLA_CCP2		33
#define BCM2835_PLLD_DSI0		34
#define BCM2835_PLLD_DSI1		35

#define BCM2835_CLOCK_AVEO		36
#define BCM2835_CLOCK_DFT		37
#define BCM2835_CLOCK_GP0		38
#define BCM2835_CLOCK_GP1		39
#define BCM2835_CLOCK_GP2		40
#define BCM2835_CLOCK_SLIM		41
#define BCM2835_CLOCK_SMI		42
#define BCM2835_CLOCK_TEC		43
#define BCM2835_CLOCK_DPI		44
#define BCM2835_CLOCK_CAM0		45
#define BCM2835_CLOCK_CAM1		46
#define BCM2835_CLOCK_DSI0E		47
#define BCM2835_CLOCK_DSI1E		48
soc/codecs/wm9081.h?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/sound/soc/codecs/wm9081.h?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/sound/soc/codecs/wm9081.h'>
<input type='hidden' name='id' value='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/codecs?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>codecs</a>/<a href='/cgit.cgi/linux/net-next.git/commit/sound/soc/codecs/wm9081.h?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>wm9081.h</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/codecs/wm9081.h?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>3efa70d78f218e4c9276b0bac0545e5184c1c47b</a> (<a href='/cgit.cgi/linux/net-next.git/patch/sound/soc/codecs/wm9081.h?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/codecs/wm9081.h?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>sound/soc/codecs/wm9081.h</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/sound/soc/codecs/wm9081.h?id=76e0e70e6452b971a69cc9794ff4a6715c11f7f2'>76e0e70e6452b971a69cc9794ff4a6715c11f7f2</a> (<a href='/cgit.cgi/linux/net-next.git/diff/sound/soc/codecs/wm9081.h?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/codecs/wm9081.h?id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742</a> (<a href='/cgit.cgi/linux/net-next.git/diff/sound/soc/codecs/wm9081.h?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/codecs/wm9081.h')</div><table summary='diffstat' class='diffstat'>