lkml.org 
[lkml]   [2015]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/9] mfd: arizona: Add registers for ADC microphone detection
    Date
    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 <ckeepax@opensource.wolfsonmicro.com>
    Acked-by: Lee Jones <lee.jones@linaro.org>
    ---
    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 | 6 +++---
    4 files changed, 10 insertions(+), 3 deletions(-)

    diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
    index c4b9374..5f604e0 100644
    --- a/drivers/mfd/wm5110-tables.c
    +++ b/drivers/mfd/wm5110-tables.c
    @@ -1811,6 +1811,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:
    @@ -2847,6 +2848,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 1dc3858..92f31ffa 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) */
    unsigned int micd_detect_debounce;

    diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
    index fdd70b3..ab219c9 100644
    --- a/include/linux/mfd/arizona/registers.h
    +++ b/include/linux/mfd/arizona/registers.h
    @@ -2359,9 +2359,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
    --
    1.7.2.5


    \
     
     \ /
      Last update: 2015-09-16 12:21    [W:4.558 / U:0.416 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site