From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751266AbbIKH5p (ORCPT ); Fri, 11 Sep 2015 03:57:45 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:32918 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751465AbbIKH5n convert rfc822-to-8bit (ORCPT ); Fri, 11 Sep 2015 03:57:43 -0400 X-AuditID: cbfee68e-f79c56d000006efb-8b-55f289753613 MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 8BIT Message-id: <55F28975.2070907@samsung.com> Date: Fri, 11 Sep 2015 16:57:41 +0900 From: Chanwoo Choi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 To: Charles Keepax , lee.jones@linaro.org Cc: myungjoo.ham@samsung.com, sameo@linux.intel.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com Subject: Re: [PATCH RESEND 1/5] mfd: arizona: Add registers for ADC microphone detection References: <1441787690-30148-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> In-reply-to: <1441787690-30148-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJIsWRmVeSWpSXmKPExsWyRsSkRLe081Oowb9FMhb/ptxgt5h/5Byr xf2vRxktLu+aw2Zxu3EFm8Xyt//ZLE53szqwe9y5tofNY97JQI+XE3+zefRtWcXo8XmTXABr FJdNSmpOZllqkb5dAlfGiq5lTAVPNStOt1xmbWA8pNDFyMkhIWAiceTtcnYIW0ziwr31bF2M XBxCAisYJXrnNjDCFM04cYsdIrGUUWLjhalMIAleAUGJH5PvsYDYzALqEpPmLWKGsEUk5h7u YISwtSWWLXzNDNH8gFHiRNdqqGYtibNvG9hAbBYBVYk9vSfBGtiA4vtf3ACKc3CICkRIdJ+o BAmLCPhJfNh5lwVkDrPANEaJfzMPgp0tLBAlsatvGzNIvZBAqMTCeSkgYU6BMImryxeC7ZUQ uMYusa3zHivELgGJb5MPsYDUSwjISmw6wAzxpKTEwRU3WCYwis9C8tosJK/NQvLaLCSvLWBk WcUomlqQXFCclF5kpFecmFtcmpeul5yfu4kRGKOn/z3r28F484D1IUYBDkYlHl4L1U+hQqyJ ZcWVuYcYTYEumsgsJZqcD0wEeSXxhsZmRhamJqbGRuaWZkrivAlSP4OFBNITS1KzU1MLUovi i0pzUosPMTJxcEo1MMbwHHvPquywLPPa7mnLeHbtm+x3q1Lnv8E69fzAC9P7BbW+sU4R39HZ Xy6yNnBdav4mYZbiTwfvaOz7EBe1e0r7V/mNNRVPJyxh+WLfZFSw6MDi5Unts5r+Re8Murdt /orF934das34tjRl1oVnTcJPXwh++jz13cmvL2s/VF63NYvPt6zwSj+sxFKckWioxVxUnAgA +BCA/MwCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsVy+t9jAd3Szk+hBh+2C1v8m3KD3WL+kXOs Fve/HmW0uLxrDpvF7cYVbBbL3/5nszjdzerA7nHn2h42j3knAz1eTvzN5tG3ZRWjx+dNcgGs UQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlAVygp lCXmlAKFAhKLi5X07TBNCA1x07WAaYzQ9Q0JgusxMkADCWsYMy4+ms5acF6z4uL8BywNjGsU uhg5OSQETCRmnLjFDmGLSVy4t56ti5GLQ0hgKaPExgtTmUASvAKCEj8m32PpYuTgYBaQlzhy KRskzCygLjFp3iJmiPoHjBInulZD1WtJnH3bwAZiswioSuzpPckIYrMBxfe/uMEGMkdUIEKi +0QlSFhEwE/iw867LCBzmAWmMUr8m3kQ7CBhgSiJXX3bmEHqhQRCJRbOSwEJcwqESVxdvpB5 AqPALCTXzUK4bhaS6xYwMq9ilEgtSC4oTkrPNcxLLdcrTswtLs1L10vOz93ECI7pZ1I7GA/u cj/EKMDBqMTDa6H6KVSINbGsuDL3EKMEB7OSCK9tB1CINyWxsiq1KD++qDQntfgQoynQexOZ pUST84HpJq8k3tDYxMzI0sjc0MLI2FxJnFd25bNQIYH0xJLU7NTUgtQimD4mDk6pBsbUpPxP c3OfTJr9yv/D/S3yqopx/wWWndiU/uH/FTX7Z1aW/NXbA5kXTNJ2ervlabdbzqyVh9ZOEVtT 9fHtxNkqhj9fH7FediIm601wUg3HtUSLaEOJlTabd7YH+JzbP30Kv/3hszsZw1MUVP79cEvY rbvmtuXO3xuiH+9pOPf+1OuwG9Uztf4tV2Ipzkg01GIuKk4EACTFJHP/AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Lee, Charles, I make the temporary branch[1] and then apply patch1-patch4 without patch5 because of patch5 may need the ack message by DT maintainer. If Lee want to make the immutable branch and send the pull request, I'll make the immutable branch based on Linux-4.3-rcX and send it to MFD maintainer (Lee Jones). [1] branch name : extcon-next-v4.4-for-arizona - git.kernel.org/cgit/linux/kernel/git/chanwoo/extcon.git/log/?h=extcon-next-v4.4-for-arizona I need the your opinion. Thanks, Chanwoo Choi On 2015년 09월 09일 17:34, Charles Keepax wrote: > The newer devices support using a software comparison to determine > whether a 3/4 pole jack is present. Add the registers necessary for > this. > > Signed-off-by: Charles Keepax > Acked-by: Lee Jones > --- > drivers/mfd/wm5110-tables.c | 2 ++ > include/dt-bindings/mfd/arizona.h | 2 ++ > include/linux/mfd/arizona/pdata.h | 3 +++ > include/linux/mfd/arizona/registers.h | 17 ++++++++++++++--- > 4 files changed, 21 insertions(+), 3 deletions(-) > > diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c > index 12cad94..dd27872 100644 > --- a/drivers/mfd/wm5110-tables.c > +++ b/drivers/mfd/wm5110-tables.c > @@ -1807,6 +1807,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg) > case ARIZONA_MIC_DETECT_1: > case ARIZONA_MIC_DETECT_2: > case ARIZONA_MIC_DETECT_3: > + case ARIZONA_MIC_DETECT_4: > case ARIZONA_MIC_DETECT_LEVEL_1: > case ARIZONA_MIC_DETECT_LEVEL_2: > case ARIZONA_MIC_DETECT_LEVEL_3: > @@ -2843,6 +2844,7 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg) > case ARIZONA_ASYNC_SAMPLE_RATE_1_STATUS: > case ARIZONA_ASYNC_SAMPLE_RATE_2_STATUS: > case ARIZONA_MIC_DETECT_3: > + case ARIZONA_MIC_DETECT_4: > case ARIZONA_HP_CTRL_1L: > case ARIZONA_HP_CTRL_1R: > case ARIZONA_HEADPHONE_DETECT_2: > diff --git a/include/dt-bindings/mfd/arizona.h b/include/dt-bindings/mfd/arizona.h > index 7b2000c..c40f665 100644 > --- a/include/dt-bindings/mfd/arizona.h > +++ b/include/dt-bindings/mfd/arizona.h > @@ -107,5 +107,7 @@ > #define ARIZONA_ACCDET_MODE_MIC 0 > #define ARIZONA_ACCDET_MODE_HPL 1 > #define ARIZONA_ACCDET_MODE_HPR 2 > +#define ARIZONA_ACCDET_MODE_HPM 4 > +#define ARIZONA_ACCDET_MODE_ADC 7 > > #endif > diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h > index 43db4fa..f030a32 100644 > --- a/include/linux/mfd/arizona/pdata.h > +++ b/include/linux/mfd/arizona/pdata.h > @@ -124,6 +124,9 @@ struct arizona_pdata { > /** Channel to use for headphone detection */ > unsigned int hpdet_channel; > > + /** Use software comparison to determine mic presence */ > + bool micd_software_compare; > + > /** Extra debounce timeout used during initial mic detection (ms) */ > int micd_detect_debounce; > > diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h > index 3499d36..3f3bb2b 100644 > --- a/include/linux/mfd/arizona/registers.h > +++ b/include/linux/mfd/arizona/registers.h > @@ -139,6 +139,7 @@ > #define ARIZONA_MIC_DETECT_LEVEL_2 0x2A7 > #define ARIZONA_MIC_DETECT_LEVEL_3 0x2A8 > #define ARIZONA_MIC_DETECT_LEVEL_4 0x2A9 > +#define ARIZONA_MIC_DETECT_4 0x2AB > #define ARIZONA_MIC_NOISE_MIX_CONTROL_1 0x2C3 > #define ARIZONA_ISOLATION_CONTROL 0x2CB > #define ARIZONA_JACK_DETECT_ANALOGUE 0x2D3 > @@ -2301,9 +2302,9 @@ > #define ARIZONA_ACCDET_SRC_MASK 0x2000 /* ACCDET_SRC */ > #define ARIZONA_ACCDET_SRC_SHIFT 13 /* ACCDET_SRC */ > #define ARIZONA_ACCDET_SRC_WIDTH 1 /* ACCDET_SRC */ > -#define ARIZONA_ACCDET_MODE_MASK 0x0003 /* ACCDET_MODE - [1:0] */ > -#define ARIZONA_ACCDET_MODE_SHIFT 0 /* ACCDET_MODE - [1:0] */ > -#define ARIZONA_ACCDET_MODE_WIDTH 2 /* ACCDET_MODE - [1:0] */ > +#define ARIZONA_ACCDET_MODE_MASK 0x0007 /* ACCDET_MODE - [2:0] */ > +#define ARIZONA_ACCDET_MODE_SHIFT 0 /* ACCDET_MODE - [2:0] */ > +#define ARIZONA_ACCDET_MODE_WIDTH 3 /* ACCDET_MODE - [2:0] */ > > /* > * R667 (0x29B) - Headphone Detect 1 > @@ -2413,6 +2414,16 @@ > #define ARIZONA_MICD_STS_WIDTH 1 /* MICD_STS */ > > /* > + * R683 (0x2AB) - Mic Detect 4 > + */ > +#define ARIZONA_MICDET_ADCVAL_DIFF_MASK 0xFF00 /* MICDET_ADCVAL_DIFF - [15:8] */ > +#define ARIZONA_MICDET_ADCVAL_DIFF_SHIFT 8 /* MICDET_ADCVAL_DIFF - [15:8] */ > +#define ARIZONA_MICDET_ADCVAL_DIFF_WIDTH 8 /* MICDET_ADCVAL_DIFF - [15:8] */ > +#define ARIZONA_MICDET_ADCVAL_MASK 0x007F /* MICDET_ADCVAL - [15:8] */ > +#define ARIZONA_MICDET_ADCVAL_SHIFT 0 /* MICDET_ADCVAL - [15:8] */ > +#define ARIZONA_MICDET_ADCVAL_WIDTH 7 /* MICDET_ADCVAL - [15:8] */ > + > +/* > * R707 (0x2C3) - Mic noise mix control 1 > */ > #define ARIZONA_MICMUTE_RATE_MASK 0x7800 /* MICMUTE_RATE - [14:11] */ >