Subject: linux-next: manual merge of the extcon tree with the mfd tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 28 May 2015 19:06:11 +1000

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                    [email-masked]

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