lkml.org 
[lkml]   [2013]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the char-misc tree with the sound-asoc tree
Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
include/linux/mfd/arizona/pdata.h between commit c94aa30edac4 ("ASoC:
arizona: Allow number of channels clocked to be restricted") from the
sound-asoc tree and commit 92a49871b378 ("extcon: arizona: Support use of
GPIO5 as an input to jack detection") from the char-misc 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/linux/mfd/arizona/pdata.h
index ec3e2a2,bcbe4fd..0000000
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@@ -98,13 -96,15 +98,22 @@@ struct arizona_pdata
/** Pin state for GPIO pins */
int gpio_defaults[ARIZONA_MAX_GPIO];

+ /**
+ * Maximum number of channels clocks will be generated for,
+ * useful for systems where and I2S bus with multiple data
+ * lines is mastered.
+ */
+ int max_channels_clocked[ARIZONA_MAX_AIF];
+
+ /** GPIO5 is used for jack detection */
+ bool jd_gpio5;
+
+ /** Use the headphone detect circuit to identify the accessory */
+ bool hpdet_acc_id;
+
+ /** GPIO used for mic isolation with HPDET */
+ int hpdet_id_gpio;
+
/** GPIO for mic detection polarity */
int micd_pol_gpio;

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-01-28 12:43    [W:0.068 / U:0.320 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site