From patchwork Thu Apr 30 01:37:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inha Song X-Patchwork-Id: 6299481 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2E82EBEEE1 for ; Thu, 30 Apr 2015 01:38:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 191822018E for ; Thu, 30 Apr 2015 01:38:49 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id C6B6E2017D for ; Thu, 30 Apr 2015 01:38:47 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id DEA0E261555; Thu, 30 Apr 2015 03:38:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 89249261299; Thu, 30 Apr 2015 03:38:13 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id AA9EA2608B4; Thu, 30 Apr 2015 03:38:11 +0200 (CEST) Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by alsa0.perex.cz (Postfix) with ESMTP id E42E4260851 for ; Thu, 30 Apr 2015 03:38:03 +0200 (CEST) Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NNL00DCYJ7DOZ10@mailout1.samsung.com> for alsa-devel@alsa-project.org; Thu, 30 Apr 2015 10:38:01 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.115]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 75.B9.18889.97781455; Thu, 30 Apr 2015 10:38:01 +0900 (KST) X-AuditID: cbfee68d-f79266d0000049c9-3c-55418779ecd3 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 35.46.25346.97781455; Thu, 30 Apr 2015 10:38:01 +0900 (KST) Received: from songinha-Samsung-DeskTop-System.10.32.193.11 ([10.252.81.136]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NNL00EP6J7B5J60@mmp1.samsung.com>; Thu, 30 Apr 2015 10:38:01 +0900 (KST) From: Inha Song To: lee.jones@linaro.org Date: Thu, 30 Apr 2015 10:37:57 +0900 Message-id: <1430357878-22859-2-git-send-email-ideal.song@samsung.com> X-Mailer: git-send-email 2.0.0.390.gcb682f8 In-reply-to: <1430357878-22859-1-git-send-email-ideal.song@samsung.com> References: <1430357878-22859-1-git-send-email-ideal.song@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplkeLIzCtJLcpLzFFi42JZI2JSrFvZ7hhqMPOclsWVi4eYLKY+fMJm 8W/KDXaL61+es1rMP3KO1WLX3/uMFuderWS0uP/1KKPF5V1z2CyWXr/IZLH87X82iwnT17JY zJr4h8Wide8Rdgc+jw2fm9g81sxbw+ixcvkXNo9NqzrZPO5c28Pm8XLibzaPvi2rGD0+b5IL 4IjisklJzcksSy3St0vgyph65wJLwValigMX57I1MH6S6WLk5JAQMJFontfLCGGLSVy4t56t i5GLQ0hgKaNE599dzDBFc14vYgOxhQQWASX2eUEUTWSS+PN6EztIgk1AQ+L7581gDSICEhIb f/SxgBQxC/xkkvh69wtYQligVmL+zd9gNouAqsT/7ftZQGxeATeJtg3P2SC2aUvsa5gJZnMK uEusffuVCWKzm8T5r+9YIGoesUt8/S8DMUdA4tvkQ0BxDqC4rMSmA1BHS0ocXHGDZQKj8AJG hlWMoqkFyQXFSelFhnrFibnFpXnpesn5uZsYgbF0+t+z3h2Mtw9YH2IU4GBU4uEV1HUIFWJN LCuuzD3EaAq0YSKzlGhyPjBi80riDY3NjCxMTUyNjcwtzZTEeRWlfgYLCaQnlqRmp6YWpBbF F5XmpBYfYmTi4JRqYGyo1n4SrHVlbheXGlNKpsK5o6q9djsfFnV3r/1UcYezhmupUfBbne4V ry7eefxi3Y3pMYGVP3TEVRtU9Z5f0/V8zHjEwveO79KV56ZW+Ve99uzTjj/+2HVFunyepp3+ hObPrLM9Le6p3xQJ7zIp5JoVcPbEdf3rDPMbC/tUs+M2abzweJqyQ4mlOCPRUIu5qDgRAPdv 5DGgAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBIsWRmVeSWpSXmKPExsVy+t9jAd3KdsdQgz1TVSyuXDzEZDH14RM2 i39TbrBbXP/ynNVi/pFzrBa7/t5ntDj3aiWjxf2vRxktLu+aw2ax9PpFJovlb/+zWUyYvpbF YtbEPywWrXuPsDvweWz43MTmsWbeGkaPlcu/sHlsWtXJ5nHn2h42j5cTf7N59G1ZxejxeZNc AEdUA6NNRmpiSmqRQmpecn5KZl66rZJ3cLxzvKmZgaGuoaWFuZJCXmJuqq2Si0+ArltmDtDl SgpliTmlQKGAxOJiJX07TBNCQ9x0LWAaI3R9Q4LgeowM0EDCGsaMqXcusBRsVao4cHEuWwPj J5kuRk4OCQETiTmvF7FB2GISF+6tB7OFBBYxSnTu8+pi5AKyJzJJ/Hm9iR0kwSagIfH982Zm EFtEQEJi448+FpAiZoGfTBJf734BSwgL1ErMv/kbzGYRUJX4v30/C4jNK+Am0bbhOdQ2bYl9 DTPBbE4Bd4m1b78yQWx2kzj/9R3LBEbeBYwMqxhFUwuSC4qT0nMN9YoTc4tL89L1kvNzNzGC Y/WZ1A7GlQ0WhxgFOBiVeHgFdB1ChVgTy4orcw8xSnAwK4nw8hc5hgrxpiRWVqUW5ccXleak Fh9iNAW6aiKzlGhyPjCN5JXEGxqbmBlZGpkbWhgZmyuJ887RlQsVEkhPLEnNTk0tSC2C6WPi 4JRqYBSaZzPZ+aXK7btfEw1TLtbF/ShIOvO9+5j1rzUN1sxT9e9Kz/vDJLmi8XMe/5blNcvE 2Tzl5vBs6Y5vXWatc+49Q+4S5fQ73y49+u/1/NWs/G/9Tben23r/3KMmEx+3wiDv6oopp8w5 FtxT57WsMvFbfUlr2lKpiVfa8gVTZgRxmNtOm3qjf40SS3FGoqEWc1FxIgDiSu/p6wIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, cw00.choi@samsung.com, broonie@kernel.org, ckeepax@opensource.wolfsonmicro.com, rf@opensource.wolfsonmicro.com, Inha Song Subject: [alsa-devel] [PATCH v4 1/2] extcon: arizona: Add support for select accessory detect mode when headphone detection X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP This patch add support for select accessory detect mode to HPDETL or HPDETR. Arizona provides a headphone detection circuit on the HPDETL and HPDETR pins to measure the impedance of an external load connected to the headphone. Depending on board design, headphone detect pins can change to HPDETR or HPDETL. Signed-off-by: Inha Song Acked-by: Charles Keepax Acked-by: Lee Jones --- drivers/extcon/extcon-arizona.c | 38 ++++++++++++++++++++++++++++++-------- include/dt-bindings/mfd/arizona.h | 8 ++++++++ include/linux/mfd/arizona/pdata.h | 3 +++ 3 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 include/dt-bindings/mfd/arizona.h diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index 63f01c4..d251e92 100644 --- a/drivers/extcon/extcon-arizona.c +++ b/drivers/extcon/extcon-arizona.c @@ -32,13 +32,10 @@ #include #include #include +#include #define ARIZONA_MAX_MICD_RANGE 8 -#define ARIZONA_ACCDET_MODE_MIC 0 -#define ARIZONA_ACCDET_MODE_HPL 1 -#define ARIZONA_ACCDET_MODE_HPR 2 - #define ARIZONA_MICD_CLAMP_MODE_JDL 0x4 #define ARIZONA_MICD_CLAMP_MODE_JDH 0x5 #define ARIZONA_MICD_CLAMP_MODE_JDL_GP5H 0x9 @@ -653,9 +650,9 @@ static void arizona_identify_headphone(struct arizona_extcon_info *info) ret = regmap_update_bits(arizona->regmap, ARIZONA_ACCESSORY_DETECT_MODE_1, ARIZONA_ACCDET_MODE_MASK, - ARIZONA_ACCDET_MODE_HPL); + arizona->pdata.hpdet_channel); if (ret != 0) { - dev_err(arizona->dev, "Failed to set HPDETL mode: %d\n", ret); + dev_err(arizona->dev, "Failed to set HPDET mode: %d\n", ret); goto err; } @@ -705,9 +702,9 @@ static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info) ARIZONA_ACCESSORY_DETECT_MODE_1, ARIZONA_ACCDET_SRC | ARIZONA_ACCDET_MODE_MASK, info->micd_modes[0].src | - ARIZONA_ACCDET_MODE_HPL); + arizona->pdata.hpdet_channel); if (ret != 0) { - dev_err(arizona->dev, "Failed to set HPDETL mode: %d\n", ret); + dev_err(arizona->dev, "Failed to set HPDET mode: %d\n", ret); goto err; } @@ -1103,6 +1100,26 @@ static void arizona_micd_set_level(struct arizona *arizona, int index, regmap_update_bits(arizona->regmap, reg, mask, level); } +static int arizona_extcon_of_get_pdata(struct arizona *arizona) +{ + struct arizona_pdata *pdata = &arizona->pdata; + unsigned int val = ARIZONA_ACCDET_MODE_HPL; + + of_property_read_u32(arizona->dev->of_node, "wlf,hpdet-channel", &val); + switch (val) { + case ARIZONA_ACCDET_MODE_HPL: + case ARIZONA_ACCDET_MODE_HPR: + pdata->hpdet_channel = val; + break; + default: + dev_err(arizona->dev, + "Wrong wlf,hpdet-channel DT value %d\n", val); + pdata->hpdet_channel = ARIZONA_ACCDET_MODE_HPL; + } + + return 0; +} + static int arizona_extcon_probe(struct platform_device *pdev) { struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); @@ -1120,6 +1137,11 @@ static int arizona_extcon_probe(struct platform_device *pdev) if (!info) return -ENOMEM; + if (IS_ENABLED(CONFIG_OF)) { + if (!dev_get_platdata(arizona->dev)) + arizona_extcon_of_get_pdata(arizona); + } + info->micvdd = devm_regulator_get(&pdev->dev, "MICVDD"); if (IS_ERR(info->micvdd)) { ret = PTR_ERR(info->micvdd); diff --git a/include/dt-bindings/mfd/arizona.h b/include/dt-bindings/mfd/arizona.h new file mode 100644 index 0000000..9ecff78 --- /dev/null +++ b/include/dt-bindings/mfd/arizona.h @@ -0,0 +1,8 @@ +#ifndef __DT_BINDINGS_ARIZONA_H__ +#define __DT_BINDINGS_ARIZONA_H__ + +#define ARIZONA_ACCDET_MODE_MIC 0 +#define ARIZONA_ACCDET_MODE_HPL 1 +#define ARIZONA_ACCDET_MODE_HPR 2 + +#endif /* __DT_BINDINGS_ARIZONA_H__ */ diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h index 4578c72..2473a67 100644 --- a/include/linux/mfd/arizona/pdata.h +++ b/include/linux/mfd/arizona/pdata.h @@ -139,6 +139,9 @@ struct arizona_pdata { /** GPIO used for mic isolation with HPDET */ int hpdet_id_gpio; + /** Channel to use for headphone detection */ + unsigned int hpdet_channel; + /** Extra debounce timeout used during initial mic detection (ms) */ int micd_detect_debounce;