From patchwork Tue Apr 21 04:11:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inha Song X-Patchwork-Id: 6245541 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 374D0BF4A6 for ; Tue, 21 Apr 2015 04:13:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4720420445 for ; Tue, 21 Apr 2015 04:13:19 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id ECD4A2020F for ; Tue, 21 Apr 2015 04:13:17 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id DC4C5266029; Tue, 21 Apr 2015 06:13:16 +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 7AC7F265E1D; Tue, 21 Apr 2015 06:12:18 +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 60514265E1F; Tue, 21 Apr 2015 06:12:17 +0200 (CEST) Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by alsa0.perex.cz (Postfix) with ESMTP id F413C260815 for ; Tue, 21 Apr 2015 06:12:04 +0200 (CEST) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NN500FUB2C2MHC0@mailout4.samsung.com> for alsa-devel@alsa-project.org; Tue, 21 Apr 2015 13:12:02 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.113]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 22.33.17770.21EC5355; Tue, 21 Apr 2015 13:12:02 +0900 (KST) X-AuditID: cbfee691-f79ca6d00000456a-57-5535ce1231c4 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B7.BD.03871.21EC5355; Tue, 21 Apr 2015 13:12:02 +0900 (KST) Received: from songinha-Samsung-DeskTop-System.10.32.193.11 ([10.252.81.136]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NN5003RV2BZO5M1@mmp2.samsung.com>; Tue, 21 Apr 2015 13:12:01 +0900 (KST) From: Inha Song To: lee.jones@linaro.org Date: Tue, 21 Apr 2015 13:11:44 +0900 Message-id: <1429589505-11954-2-git-send-email-ideal.song@samsung.com> X-Mailer: git-send-email 2.0.0.390.gcb682f8 In-reply-to: <1429589505-11954-1-git-send-email-ideal.song@samsung.com> References: <1429589505-11954-1-git-send-email-ideal.song@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42JZI2JSqCt0zjTUYP9ZCYsrFw8xWUx9+ITN 4t+UG+wW1788Z7WYf+Qcq8Wuv/cZLc69Wslocf/rUUaLy7vmsFksvX6RyWL52/9sFhOmr2Wx mDXxD4tF694j7A58Hhs+N7F5rJm3htFj5fIvbB6bVnWyedy5tofN4+XE32wefVtWMXp83iQX wBHFZZOSmpNZllqkb5fAlbFwTVRBq0LF/lUL2RoYP0p1MXJySAiYSJzftpURwhaTuHBvPVsX IxeHkMBSRol5i/6ywhS9aVjODmILCUxnlJj5zRqiaCKTxP1zy5lBEmwCGhLfP28Gs0UEJCQ2 /uhjASliFvjJJPH17hewhLBArcSSll6gdRwcLAKqEo/vyoKYvAJuEp9WREHs0pbY1zCTDcTm FHCX2Lj/FDPEXjeJf9MusoKMlBB4xC5xZsl9sCIWAQGJb5MPsYDMkRCQldh0gBlijqTEwRU3 WCYwCi9gZFjFKJpakFxQnJReZKpXnJhbXJqXrpecn7uJERhHp/89m7iD8f4B60OMAhyMSjy8 KyaYhgqxJpYVV+YeYjQF2jCRWUo0OR8YrXkl8YbGZkYWpiamxkbmlmZK4rw60j+DhQTSE0tS s1NTC1KL4otKc1KLDzEycXBKNTBy66owbFvD82Ky07bvXo33V9TN3r/u88OJeieEjB53zGee d13NKKXWWcPm0C0mzTyTO0+jpGUe6PqVFfsZLA22kbj8+BDTlr53ep5VZy7YnWnfyvydX1Tp rcyKw+t/efd0sm+c++XZxi+Ca6zmfemwt5n5yEtT5McTtYkrnd086pdMiBD2cX2gxFKckWio xVxUnAgA99/8sZ4CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKIsWRmVeSWpSXmKPExsVy+t9jQV2hc6ahBp8OC1lcuXiIyWLqwyds Fv+m3GC3uP7lOavF/CPnWC12/b3PaHHu1UpGi/tfjzJaXN41h81i6fWLTBbL3/5ns5gwfS2L xayJf1gsWvceYXfg89jwuYnNY828NYweK5d/YfPYtKqTzePOtT1sHi8n/mbz6NuyitHj8ya5 AI6oBkabjNTElNQihdS85PyUzLx0WyXv4HjneFMzA0NdQ0sLcyWFvMTcVFslF58AXbfMHKDL lRTKEnNKgUIBicXFSvp2mCaEhrjpWsA0Ruj6hgTB9RgZoIGENYwZC9dEFbQqVOxftZCtgfGj VBcjJ4eEgInEm4bl7BC2mMSFe+vZQGwhgemMEjO/WXcxcgHZE5kk7p9bzgySYBPQkPj+eTOY LSIgIbHxRx8LSBGzwE8mia93v4AlhAVqJZa09DJ2MXJwsAioSjy+Kwti8gq4SXxaEQWxS1ti X8NMsF2cAu4SG/efYobY6ybxb9pF1gmMvAsYGVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn525i BEfpM+kdjKsaLA4xCnAwKvHwrphgGirEmlhWXJl7iFGCg1lJhPfaVKAQb0piZVVqUX58UWlO avEhRlOgmyYyS4km5wMTSF5JvKGxiZmRpZG5oYWRsbmSOO8cXblQIYH0xJLU7NTUgtQimD4m Dk6pBkZn63PPpkZOfCify+ewqqlN4IpriuWNn4H7L3oZrrhk3JeWICCVWv028N5rnc2bPHcx HTAX0ftzuU90rcl/j8Yf6+5rfa4s3hm9IefJqrSpNu937DepLq1R01igyiS+nafLPmdT1PpV q2M+z9hzd5HZP37+zWyH/hz1S2V7O0Nn3eoNy1tnPF6mxFKckWioxVxUnAgA1jqxJOgCAAA= 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 v2 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 --- drivers/extcon/extcon-arizona.c | 28 ++++++++++++++++++++-------- include/dt-bindings/mfd/arizona.h | 8 ++++++++ include/linux/mfd/arizona/pdata.h | 3 +++ 3 files changed, 31 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..c827342 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,16 @@ 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; + + of_property_read_u32(arizona->dev->of_node, "wlf,hpdet-channel", + &pdata->hpdet_channel); + + return 0; +} + static int arizona_extcon_probe(struct platform_device *pdev) { struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); @@ -1120,6 +1127,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;