From patchwork Fri May 19 03:01:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Lee X-Patchwork-Id: 9735699 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9D9546022E for ; Fri, 19 May 2017 03:01:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8623728812 for ; Fri, 19 May 2017 03:01:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A9802880A; Fri, 19 May 2017 03:01:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81E962880A for ; Fri, 19 May 2017 03:01:45 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 1DCE126756F; Fri, 19 May 2017 05:01:42 +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 F0BEA26756F; Fri, 19 May 2017 05:01:40 +0200 (CEST) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0101.outbound.protection.outlook.com [104.47.34.101]) by alsa0.perex.cz (Postfix) with ESMTP id 0F00B267593 for ; Fri, 19 May 2017 05:01:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maximintegrated.onmicrosoft.com; s=selector1-maximintegrated-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=HymPhvE/svuWiFgpUNcvWFenc47ko+fWp8WK3n9hPS4=; b=ABOIk6I2xK5bEVVvBLwA+1AAQsBFw2lq9nQiFN6V0+00CvZL8IVPcgE27TYVeiaYbCe4N3GtRxK5pqXx7px0ScFX7jccFcRYLPA+ZtYzBprg+9yOO1/qC3AYgA3R8e/YWc7dIEXNDVKULk4Rhu329gQmcth8kNa81/DAEcRnEk0= Authentication-Results: gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=none action=none header.from=maximintegrated.com; Received: from ryan-linux.maxim-ic.com (204.17.143.20) by BLUPR11MB0833.namprd11.prod.outlook.com (10.163.217.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1101.14; Fri, 19 May 2017 03:01:21 +0000 From: Ryan Lee To: , , , , , , Date: Thu, 18 May 2017 20:01:11 -0700 Message-ID: <1495162871-21519-1-git-send-email-ryans.lee@maximintegrated.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [204.17.143.20] X-ClientProxiedBy: MWHPR1201CA0015.namprd12.prod.outlook.com (10.174.253.25) To BLUPR11MB0833.namprd11.prod.outlook.com (10.163.217.143) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLUPR11MB0833: X-MS-Office365-Filtering-Correlation-Id: 18735601-10de-498c-a0f1-08d49e6354d2 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:BLUPR11MB0833; X-Microsoft-Exchange-Diagnostics: 1; BLUPR11MB0833; 3:tw3OWHkX+0DKRSUe2CTS4MYYVZXtxcKN77g5zNKxffqw3kg+tRZt47nPKWzkA5kHIteAvzW5tk0jlOFVxU65iYzMM6qTl3taSGc5Qf/VHLJGTwxMVsrodLQR0b0zxsc2X4xw9GiIUbUOEX/enqbJkt35B54J0tVQkITpoucr8rHlnEbkar44FHDG3Mu3jBoVFD0jpURpQesCBq6XUFY0yXRSc7svySZLmqk13cJUp3KNxwtvfk2iF1MUPJxEuCqXSEvv53ZzEucjR4HGUqIEgINg/p8OaVngMuu0lj6d7vBbpJVR2G7RoAYhNRcUTUkt6fuYB2gFUxTPb2aSpEchH/5U0hH3IdzjRv21vOIAN7o=; 25:ZJn8xTCiUUcGGrpYH6i1YbEs3A2jJBROKJqGcDYZLjQKZWQ0djDy++jimIPvd+hmE+j7rB5rDjkRmYOEDly1jw1kvXsh1BsA8TZSj7ScsruvCu3rY+N4Q5q2uaZhK6oKPBjYg6cLKdtYejNIx5ZCxbM7TQz+TXZo3cMiCelTHgXx+v7R9o4z4ThlixeyrQkhiXW9XjRqHDYHuLe/WmkaFiNxoIfObtYmPs4uCaqIHJnSS83ssh6QERSWLKC50VV9lQVOB8A79bzkSC+bvzlD2EM4BGFa9l2RaD9bhPGGpvC4P7Yc/B1ZLIMTgvgJMUBYV/zyXB1yPHJitsMX54BmPISnUt9V2mi7vl+ocsIw6HW4QM6oaalC8G5sW6/fB7YlRxRx1MLJNFclUWN78EIY9Ov0whTkyZhnXrn3ntaZooUsO+3YOUHhH89d8Lm/x5ZgKxtfLPX0hylV3DUpfu1UfUwL8YfdO5wPrqDkeUtMOZo= X-Microsoft-Exchange-Diagnostics: 1; BLUPR11MB0833; 31:v0lYYx3bq9xoP+vI4xAjj+4jVMAICobZFyN4M2qFNBNNE10CPqHiWokND9fd4fAH0Drh8vAxlNPZf4tnylcC4RJehs17QqX/zxs5Q1SAaAXApWjbEs3nu25nfhx2YY6B9cDwXax8UEPkkk8jorCAn5GGEKq+xVyDz3pLoq3kIdMhUh3Ua7iwSqbUo8hsOLRcD1gmrZX2ArE/KrKsCTC7vli/PeApjARwX6zp/0S/SUf5pnOdHWHrNymy7Mv3VFrw8AlDbkMnYEsSqgKWrNW6sQ==; 20:BcV8rlrBnPO3pxVXdaFlA1Je+W1sb8DhrYlwStIyZP2VesHiWGMbb7b7PgvwEaxaXOggAReBBY9MbaWgV9XWxNkAyU4ik2nGch3zceh+uyuQxWXM85VlDp+beG/7PzJjN30Ws/NA12aXNsc8K4JRvz4PqalgSeSpDGJSvu5lhyLQgT8KHDIL3HzlrcoVrMdKrx/2ZI/QJxk966ILsOl8R85Z/Xp8NXJQp/RE2vlrRsPbSaAlbZ2HJZ9bd3QgDkWubkjqOoPC0vwny1OgUQi0PjHFGyEUJD38FN919Gpnjn3b+wWIPGHZ0y9cvSIuYwmGkur3f96nXoL5asXkZfVNkz/PnYTT6lZSe6ob0MGsH5GlfPKIFVmkep5qLvCX5OCgYAUpQ/LA6HCZT0jQcSPCtmH10YnnCYr3eX2Te02DY1Lx/Rz2VBIrkWqXGsR/b/G0dv4Cic2/xQ++vgxmMZOkucgAt6JV9p0Uk4/PJ9xz74N8dtHJyNcgDWaftwYa79Qj X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(108721460000369); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041248)(20161123562025)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(6072148); SRVR:BLUPR11MB0833; BCL:0; PCL:0; RULEID:; SRVR:BLUPR11MB0833; X-Microsoft-Exchange-Diagnostics: 1; BLUPR11MB0833; 4:ApPpXPNfIoOxuzyKnDwjK0ClGLlTSv/NLnIpiT9UyNniycKz6n6IzwTEV/uContt1fwYAT18k0rE9wPM8q3JlYwCRvNKfOROKqck7SBbBV7vav3V0Sbd0AJOp+f2sy34NfjknM8P5hyEC1s74sjP/EQS7GYcBhXT4BdNPyjhL05ksk8WAQv72JjM78Wbw/l0nVUYIHK6HDkwOM0+aDgxzOOfDLkZiLKfUPh0XcZOpMN6z8kPhpfQtYzqgTlATTbV6gxIG4AVyK/GWkQsTIzucVMNM/S+6VCHCuME65+tLZJgoqkXfnC/EYSqPC7i/G46qqyNx9b41ioHNo8rSLA44pQgUaTrZyGJn3/ZgEwhSdhYh/3JRjaQY0rPyc3yUwu4woYpsg7tSUKKrUA/o7iaZcWJUtlDw+GNrH7Y05JY3/TetmuRpMtwI549aHuRi42kDrM0IVv0TLS9PuZJlgPIfj7mnA6mF+fMrmYh+C1LtCyzaS3zebgao0j+87USwyuoqzv5c/Q9UzkuJ647Alv1pkhfpeB42jEMmAYEkWqTimflGfkOhrsj/GOjkLM1AVyCOftMhPA4oyV9ogmaTdpin72C3D84+RtjcZ7R9vxCW/cXUyUD1Vl14xP5F8lqUC2+bpMpQp8dxU+y4d+Eeq/J7vMcVISvdqSwXXZWZWVQmNxgeFMlcejuU5z7gc2RQrjzObfNxVhXf76MPIAZ/I6kflUyFgD+jthTuxd+iasgdvRuzoACABXoO0q91huNiP3QE6faqVpP2S0un8ZPi5/rgsXHaMIDQm/n7pPYd5cevdnXjSrjl8GzQH372ndRKuavv9Uvku7nSmDJhWe+DbxobMWwEgDPNWX5h644XDkj38U= X-Forefront-PRVS: 031257FE13 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39410400002)(39840400002)(39400400002)(39450400003)(39860400002)(39850400002)(305945005)(72206003)(6116002)(2201001)(3846002)(7736002)(50466002)(53416004)(36756003)(42186005)(25786009)(478600001)(575784001)(86362001)(189998001)(6666003)(5660300001)(47776003)(6512007)(50986999)(53936002)(66066001)(50226002)(4326008)(8676002)(33646002)(81166006)(48376002)(6486002)(6506006)(38730400002)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR11MB0833; H:ryan-linux.maxim-ic.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR11MB0833; 23:nssBPYqk1HEbsXTaKuD2zavrAKRWT7y6eUbd3CBpH?= =?us-ascii?Q?8T3MZp0ocEvnLwrburDhABu269n20DXtORoJayksicYg1xeVsrCFpSNUO+vL?= =?us-ascii?Q?DirSa+E8cghl+HHSxtyyRQCzJTd2X+MlM6+P15lfly/+suvTZ1vuml4/U9UQ?= =?us-ascii?Q?M009/fZ1ot7+5aj/AKEHEkZ8eFLMT0oqpa9beLWfPgnSr0zHJlJ0wZ2zuPwb?= =?us-ascii?Q?3Y0qkqm56p6oj8pz9GKGMGwW0SLE2Z39rbmmnVgTMLaCosIKLVDCmuQP5oOz?= =?us-ascii?Q?IJUFhzgQsD4zfCMY0flcZNSwU0VvxRVzsINkKfQZpny0keHlcFp/w9FAySmJ?= =?us-ascii?Q?eKY3r0u+z666oFPOuMyKLmGkvpxR8w7uLwutjJ7hOk9wdh0nXkr1bOSS9vO9?= =?us-ascii?Q?kYkeEJAOQ/1xks0tFs6vjNjbpgBl2RriTeDLN+pY8QJofVz73U6eY56J+WkJ?= =?us-ascii?Q?/LmckcRrjQfsqiv6BbU79GrbNkQGvuntA/R1Fl+lYGZDYB3s847LYIoRtTYu?= =?us-ascii?Q?acYvsg5htff92iF61Ql1JezCtr+/2KALNa7S1xAVf3zcRFogcuzikECZia5x?= =?us-ascii?Q?oZep6ZUteUClRtyr0n3E+SwlxGikNvBfga5ZfQrH4xM2l9OeooZwOjZd1y4d?= =?us-ascii?Q?9rn5zVOQHGLk48vLPSt8yy9Zfx0Ra5M9wpLWVCVuYX3Ym5j1cfv61LrcTXso?= =?us-ascii?Q?FABNCbZmqfnAigy3XwIAdrBQ2MW8YdpoWscYgevxRujlYxlM6w4IyCMgmOFG?= =?us-ascii?Q?bBXzIJT0cGv3AMLG4nYdz35zkmUVIDQ0nqQYQS1unD73KVL8BsPOIXxfRHtO?= =?us-ascii?Q?DQEFcPh8IHPwulW5olvwUYjKRU2aZ0ngwsliIBL1MHEyHhAw8xVeT4tjRThx?= =?us-ascii?Q?1mrQ1t1TQspSZ5BBxmsNfE0tbPvZjcXdKD57RITBUMn8nBXfuva+6A4wMfAo?= =?us-ascii?Q?NDg3ytizg2KCdmWIIK7uWEA77lWjKg2a1kzwJr3+gZGAITddEf0bqgDiyiqz?= =?us-ascii?Q?tCI66CnHYlR1VYwbeaY30Gh?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR11MB0833; 6:gjI/U1joimdsUu5zLPve/ZgNZmtGRcXhHAxQEQBOLwqNDelGHQO+Axc4lKhrTsWh/pF3vlH00scMbxKCrWCU4aUDSmhT81fn66iKdcyK8a468gb07iUnwUfDOquG/QPzte89/lxZZ7s69+A3M4Up1QZ3bz8W6V3HPQvzeQ7gRgufA+255LyjqhzxFbpmk4aNgi2xf6VJeCmHYCvC5pT895caIRm42rFSq1aiAs3t1bV+if1s+V4k2BjRVP4KyTbPbb647cl7fEIfi6VrI3ntji1OYq005lGdN8EPq59RpcGk60/2eJllDgrQr8wc29KKKJ4Nr6VOIMEv+ajP4/GFw4KtnW4XeXwhMSuA1YYVpZeUbX6iKZKHeKgW/R7oEkdZOFYMkK8kVODXDrDN1D69dl5Whoa8MXKhaIlMUxkLd0DuLxRrWjDSm7ikEyJSbZuccz+7UEuELjc9fs1pvHxXqhH/OB0SnGUlzBSlSYrTrKc2zZAJxzRIsMfiAyI2A/8JqJRusXKhz43m6K+ygzuVOt2k3bjhRlU9vED2qJ315v0=; 5:P8uiBg7+2zgBXvnzRGOvMKjvw5ogE2JHrJtnDPnSooECElcLg3Wni+viNdoDGDJqXv/J1FC2Q3rbdJQVQjqmB4AemcVP0EinZ2/xwsHU5ESyY7wMNFrEXPAJiMy9LzuErZLK80RFGUrJiu49biL/CA==; 24:t0TJjThDAf3EehKqwcERF1ppLTxCXkyDCqw8fnAx6m+zvkOAEbqlyGsrojYXuf2JrmKeWsSAe4kv0NJWZZoIvnmPxWqUdKpmIGybQ/+Cu8I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR11MB0833; 7:bjX1/U1beI0Rj35oT0Uh5RwAoSkPLc7FBEMkRO0rDi+6xhx6GHviIJ+u0xrjuLUAV7nyH0r8XRc5OrqtYT8ffvZNsPzPiJJ8FglgKg7MfjJNX4yK2Pm5XCf/wuw3CumovA8Y0Ipzs+fUdvBSz+Hhxxbju1ilnakdijJGYUN/tJvGXzvEj7huVPtGKblk1IfUTJPvlQXUdLqJuL1n+dlBEmwrHZmyssGD8pvG51pADe9emQKmXt00v9ZTkbgB2ltsn7f/rTzBN/BeQ/fxt9pPtOKwz65vKJa2IAAGKAn1Hb8WY7c3Ll9qUjMMso8J4F52PNSIpDBnqxcgM9EE4ATYzQ== X-OriginatorOrg: maximintegrated.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2017 03:01:21.8895 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR11MB0833 Cc: ryan.lee.maxim@gmail.com Subject: [alsa-devel] [PATCH 2/5] staging: max98927: Added controls for Envelope tracking 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ryan Lee --- sound/soc/codecs/max98927.c | 20 ++++++++++++++++---- sound/soc/codecs/max98927.h | 4 ++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c index 99d6e41..cdee3a3 100644 --- a/sound/soc/codecs/max98927.c +++ b/sound/soc/codecs/max98927.c @@ -614,6 +614,18 @@ static SOC_ENUM_SINGLE_DECL(max98927_current_limit, MAX98927_R0042_BOOST_CTRL1, 1, max98927_current_limit_text); +static const char * const max98927_env_track_headroom_text[] = { + "0.000V", "0.125V", "0.250V", "0.375V", "0.500V", "0.625V", + "0.750V", "0.875V", "1.000V", "1.125V", "1.250V", "1.375V", + "1.500V", "1.625V", "1.750V", "1.875V", "2.000V", "2.125V", + "2.250V", "2.375V", "2.500V", "2.625V", "2.750V", "2.875V", + "3.000V", "3.125V", "3.250V", "3.375V", "3.500V" +}; + +static SOC_ENUM_SINGLE_DECL(max98927_env_track_headroom, + MAX98927_R0082_ENV_TRACK_VOUT_HEADROOM, 0, + max98927_env_track_headroom_text); + static const struct snd_kcontrol_new max98927_snd_controls[] = { SOC_SINGLE_TLV("Speaker Volume", MAX98927_R003C_SPK_GAIN, 0, 6, 0, @@ -631,6 +643,9 @@ static const struct snd_kcontrol_new max98927_snd_controls[] = { MAX98927_AMP_VOL_SEL_SHIFT, 1, 0), SOC_ENUM("Boost Output Voltage", max98927_boost_voltage), SOC_ENUM("Current Limit", max98927_current_limit), + SOC_SINGLE("EnvTrack Switch", MAX98927_R0086_ENV_TRACK_CTRL, + MAX98927_ENV_TRACKER_EN_SHIFT, 1, 0), + SOC_ENUM("EnvTrack Headroom", max98927_env_track_headroom), }; static const struct snd_soc_dapm_route max98927_audio_map[] = { @@ -726,13 +741,10 @@ static int max98927_probe(struct snd_soc_codec *codec) /* Envelope Tracking configuration */ regmap_write(max98927->regmap, MAX98927_R0082_ENV_TRACK_VOUT_HEADROOM, - 0x08); + 0x0A); regmap_write(max98927->regmap, MAX98927_R0086_ENV_TRACK_CTRL, 0x01); - regmap_write(max98927->regmap, - MAX98927_R0087_ENV_TRACK_BOOST_VOUT_READ, - 0x10); /* voltage, current slot configuration */ regmap_write(max98927->regmap, diff --git a/sound/soc/codecs/max98927.h b/sound/soc/codecs/max98927.h index bf7a6f92..3069a09 100644 --- a/sound/soc/codecs/max98927.h +++ b/sound/soc/codecs/max98927.h @@ -250,6 +250,10 @@ #define MAX98927_BROWNOUT_DSP_EN (0x1 << 2) #define MAX98927_BROWNOUT_DSP_SHIFT (2) +/* MAX98927_R0086_ENV_TRACK_CTRL */ +#define MAX98927_ENV_TRACKER_EN (0x1 << 0) +#define MAX98927_ENV_TRACKER_EN_SHIFT (0) + /* MAX98927_R0100_SOFT_RESET */ #define MAX98927_SOFT_RESET (0x1 << 0)