From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the sound-asoc tree
Date: Fri, 3 Feb 2012 12:59:02 +1100 [thread overview]
Message-ID: <20120203125902.558e273c84b339957869f281@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/codecs/wm5100.c due to a bad merge resolution in commit
05960268bcef ("Merge branch 'for-3.4' into asoc-next") from the
sound-asoc tree which left the conflict unresolved. :-(
I fixed it up (I think - see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc sound/soc/codecs/wm5100.c
index c1c351a,72ebbdb..0000000
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@@ -2076,17 -2097,21 +2097,7 @@@ static void wm5100_micd_irq(struct wm51
snd_soc_jack_report(wm5100->jack, SND_JACK_BTN_0,
SND_JACK_BTN_0);
} else if (wm5100->jack_detecting) {
- dev_dbg(wm5100->dev, "Headphone detected\n");
- wm5100->jack_detecting = false;
- snd_soc_jack_report(wm5100->jack, SND_JACK_HEADPHONE,
- SND_JACK_HEADPHONE);
-
- /* Increase the detection rate a bit for
- * responsiveness.
- */
- regmap_update_bits(wm5100->regmap, WM5100_MIC_DETECT_1,
- WM5100_ACCDET_RATE_MASK,
- 7 << WM5100_ACCDET_RATE_SHIFT);
-<<<<<<< HEAD
- dev_dbg(codec->dev, "Headphone detected\n");
- wm5100->jack_detecting = false;
- snd_soc_jack_report(wm5100->jack, SND_JACK_HEADPHONE,
- SND_JACK_HEADPHONE);
-
- /* Increase the detection rate a bit for
- * responsiveness.
- */
- snd_soc_update_bits(codec, WM5100_MIC_DETECT_1,
- WM5100_ACCDET_RATE_MASK,
- 7 << WM5100_ACCDET_RATE_SHIFT);
-=======
+ wm5100_report_headphone(wm5100);
->>>>>>> for-3.4
}
}
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-02-03 1:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-03 1:59 Stephen Rothwell [this message]
2012-02-03 10:51 ` linux-next: manual merge of the sound-asoc tree Mark Brown
2012-02-07 23:52 ` Stephen Rothwell
2012-02-08 11:25 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2011-06-16 2:40 Stephen Rothwell
2011-06-16 10:12 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120203125902.558e273c84b339957869f281@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).