From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Chanwoo Choi <cw00.choi@samsung•com>, Lee Jones <lee.jones@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Charles Keepax <ckeepax@opensource•wolfsonmicro.com>,
Inha Song <ideal.song@samsung•com>
Subject: linux-next: manual merge of the extcon tree with the mfd tree
Date: Thu, 28 May 2015 19:06:11 +1000 [thread overview]
Message-ID: <20150528190611.3e8bfa7b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]
Hi Chanwoo,
Today's linux-next merge of the extcon tree got a conflict in
include/dt-bindings/mfd/arizona.h between commit 8dc296794d4b ("mfd:
arizona: Add convience defines for micd_rate/micd_bias_starttime") from
the mfd tree and commit 9e86b2ad4c11 ("extcon: arizona: Add support for
select accessory detect mode when headphone detection") from the extcon
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc include/dt-bindings/mfd/arizona.h
index 555609910acb,fee48e624036..000000000000
--- a/include/dt-bindings/mfd/arizona.h
+++ b/include/dt-bindings/mfd/arizona.h
@@@ -90,18 -90,8 +90,22 @@@
#define ARIZONA_INMODE_SE 1
#define ARIZONA_INMODE_DMIC 2
+#define ARIZONA_MICD_TIME_CONTINUOUS 0
+#define ARIZONA_MICD_TIME_250US 1
+#define ARIZONA_MICD_TIME_500US 2
+#define ARIZONA_MICD_TIME_1MS 3
+#define ARIZONA_MICD_TIME_2MS 4
+#define ARIZONA_MICD_TIME_4MS 5
+#define ARIZONA_MICD_TIME_8MS 6
+#define ARIZONA_MICD_TIME_16MS 7
+#define ARIZONA_MICD_TIME_32MS 8
+#define ARIZONA_MICD_TIME_64MS 9
+#define ARIZONA_MICD_TIME_128MS 10
+#define ARIZONA_MICD_TIME_256MS 11
+#define ARIZONA_MICD_TIME_512MS 12
+
+ #define ARIZONA_ACCDET_MODE_MIC 0
+ #define ARIZONA_ACCDET_MODE_HPL 1
+ #define ARIZONA_ACCDET_MODE_HPR 2
+
#endif
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2015-05-28 9:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20150528190611.3e8bfa7b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ckeepax@opensource$(echo .)wolfsonmicro.com \
--cc=cw00.choi@samsung$(echo .)com \
--cc=ideal.song@samsung$(echo .)com \
--cc=lee.jones@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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