From patchwork Mon May 4 04:42:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inha Song X-Patchwork-Id: 6323191 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C4BD59F1C2 for ; Mon, 4 May 2015 04:43:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA6E4202DD for ; Mon, 4 May 2015 04:43:31 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 74E2B202C8 for ; Mon, 4 May 2015 04:43:30 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 919072606C2; Mon, 4 May 2015 06:43:29 +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 5B5A626063D; Mon, 4 May 2015 06:43:08 +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 D4F84260A59; Mon, 4 May 2015 06:43:06 +0200 (CEST) Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by alsa0.perex.cz (Postfix) with ESMTP id 2AEB226063D for ; Mon, 4 May 2015 06:42:40 +0200 (CEST) Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NNT003ER6EIJX90@mailout3.samsung.com> for alsa-devel@alsa-project.org; Mon, 04 May 2015 13:42:18 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.112]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 50.59.24422.AA8F6455; Mon, 4 May 2015 13:42:18 +0900 (KST) X-AuditID: cbfee68f-f793b6d000005f66-c3-5546f8aafcdc Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 57.73.25346.AA8F6455; Mon, 4 May 2015 13:42:18 +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 <0NNT004RO6EGSA80@mmp2.samsung.com>; Mon, 04 May 2015 13:42:18 +0900 (KST) From: Inha Song To: cw00.choi@samsung.com, galak@codeaurora.org, ijc+devicetree@hellion.org.uk, mark.rutland@arm.com, pawel.moll@arm.com, robh+dt@kernel.org Date: Mon, 04 May 2015 13:42:13 +0900 Message-id: <1430714534-28772-2-git-send-email-ideal.song@samsung.com> X-Mailer: git-send-email 2.0.0.390.gcb682f8 In-reply-to: <1430714534-28772-1-git-send-email-ideal.song@samsung.com> References: <1430714534-28772-1-git-send-email-ideal.song@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPIsWRmVeSWpSXmKPExsWyRsSkQHfVD7dQgye7zC2uXDzEZDH14RM2 i39TbrBbXP/ynNVi/pFzrBb9bxayWuz6e5/R4tyrlYwW978eZbS4vGsOm8XS6xeZLJa//c9m MWH6WhaLWRP/sFi07j3CbnG6m9VBwGPD5yY2jzXz1jB6XO7rZfJYufwLm8emVZ1sHneu7WHz mHcy0OPlxN9sHn1bVjF6fN4kF8AVxWWTkpqTWZZapG+XwJXx5+Ur5oKjShX9u3MaGP/KdDFy ckgImEi8bL3DDmGLSVy4t56ti5GLQ0hgKaNE9/eHQA4HWNHmKVwQ8emMEu3zDzNCOBOZJL4s eQ7WzSagIfH982ZmkISIQB+jxLRj/8EcZoENTBI9x++zgFQJC9RKbH41CayDRUBV4mfvCzCb V8BNYtPa32wQd2hL7GuYCWZzCrhLHPkwhQXkDCGgmu7j2iAzJQQaOSROdi9ghpgjIPFt8iEW iFNlJTYdYIYYIylxcMUNlgmMwgsYGVYxiqYWJBcUJ6UXGesVJ+YWl+al6yXn525iBMbb6X/P +ncw3j1gfYhRgINRiYf3xCq3UCHWxLLiytxDjKZAGyYyS4km5wOjOq8k3tDYzMjC1MTU2Mjc 0kxJnHeh1M9gIYH0xJLU7NTUgtSi+KLSnNTiQ4xMHJxSDYxF5/7lnn6VevD4vE5m191cB+dd Ph5o9lK9ZMXRW3+KOh5+mSJgHvownrfv7rndKmevS0n6+j35dWnP+ptT4p5bHV98UNtomcRW HdNtH7gOldx7sP3OuoUT8nYf0zCd9c+gbteFu3YdN/Nebl2wzuLzIoufXzrifPVn/d28fp7c p9epoeY/TBQN3JRYijMSDbWYi4oTAf7xI0eyAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJIsWRmVeSWpSXmKPExsVy+t9jQd1VP9xCDVb/NrC4cvEQk8XUh0/Y LP5NucFucf3Lc1aL+UfOsVr0v1nIarHr731Gi3OvVjJa3P96lNHi8q45bBZLr19kslj+9j+b xYTpa1ksZk38w2LRuvcIu8XpblYHAY8Nn5vYPNbMW8Pocbmvl8lj5fIvbB6bVnWyedy5tofN Y97JQI+XE3+zefRtWcXo8XmTXABXVAOjTUZqYkpqkUJqXnJ+SmZeuq2Sd3C8c7ypmYGhrqGl hbmSQl5ibqqtkotPgK5bZg7QL0oKZYk5pUChgMTiYiV9O0wTQkPcdC1gGiN0fUOC4HqMDNBA whrGjD8vXzEXHFWq6N+d08D4V6aLkYNDQsBEYvMUri5GTiBTTOLCvfVsXYxcHEIC0xkl2ucf ZoRwJjJJfFnynB2kik1AQ+L7583MIAkRgT5GiWnH/oM5zAIbmCR6jt9nAakSFqiV2PxqElgH i4CqxM/eF2A2r4CbxKa1v9kg9mlL7GuYCWZzCrhLHPkwhQXkJCGgmu7j2hMYeRcwMqxiFE0t SC4oTkrPNdQrTswtLs1L10vOz93ECI7mZ1I7GFc2WBxiFOBgVOLhPbHKLVSINbGsuDL3EKME B7OSCO+Tj0Ah3pTEyqrUovz4otKc1OJDjKZAR01klhJNzgcmmrySeENjEzMjSyNzQwsjY3Ml cd45unKhQgLpiSWp2ampBalFMH1MHJxSDYzrtxfzi6TEyftL6h97tDVve8ejF2enJDI332aw /cp57OHXz6f89N+sbg+a09S06blmSYKbotr+qUxvrt/WsRJkTMx82n/uAqd2yMtvEYqbLH7Y 1Ih9za1ZyZZU8U4sal7RH8fohg3rJ83JX3DudaTJI/8/vcqFErUPKsOOa0/9yT7jruucslwl luKMREMt5qLiRAAFfECR/AIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, sameo@linux.intel.com, lee.jones@linaro.org, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, broonie@kernel.org, ckeepax@opensource.wolfsonmicro.com, rf@opensource.wolfsonmicro.com, Inha Song Subject: [alsa-devel] [PATCH v5 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: Lee Jones Acked-by: Charles Keepax --- drivers/extcon/extcon-arizona.c | 38 ++++++++++++++++++++++++++++++-------- include/dt-bindings/mfd/arizona.h | 4 ++++ include/linux/mfd/arizona/pdata.h | 3 +++ 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index 5e08c35..1ec06b4 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 @@ -671,9 +668,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; } @@ -723,9 +720,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; } @@ -1121,6 +1118,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); @@ -1138,6 +1155,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 index c7af7c7..fee48e6 100644 --- a/include/dt-bindings/mfd/arizona.h +++ b/include/dt-bindings/mfd/arizona.h @@ -90,4 +90,8 @@ #define ARIZONA_INMODE_SE 1 #define ARIZONA_INMODE_DMIC 2 +#define ARIZONA_ACCDET_MODE_MIC 0 +#define ARIZONA_ACCDET_MODE_HPL 1 +#define ARIZONA_ACCDET_MODE_HPR 2 + #endif diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h index 1789cb0..aa5c48b 100644 --- a/include/linux/mfd/arizona/pdata.h +++ b/include/linux/mfd/arizona/pdata.h @@ -121,6 +121,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;