Message ID | 87h9klhw5e.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
---|---|
State | Accepted |
Commit | b323dd30718e2055adb5534e52f685a57c119c18 |
Headers | show
Return-Path: <alsa-devel-bounces@alsa-project.org> 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 5CBFD9F2EC for <patchwork-alsa-devel@patchwork.kernel.org>; Tue, 17 Nov 2015 08:29:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 969482047D for <patchwork-alsa-devel@patchwork.kernel.org>; Tue, 17 Nov 2015 08:29:43 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 6761A2047C for <patchwork-alsa-devel@patchwork.kernel.org>; Tue, 17 Nov 2015 08:29:42 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 7DEEF2605F0; Tue, 17 Nov 2015 09:29:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, NO_DNS_FOR_FROM, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 798DE261AE7; Tue, 17 Nov 2015 09:29:24 +0100 (CET) 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 4DE53264FBB; Tue, 17 Nov 2015 09:29:23 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id B6C5E2650F7 for <alsa-devel@alsa-project.org>; Tue, 17 Nov 2015 09:29:00 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 17 Nov 2015 17:28:59 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 1DC6B4EC75; Tue, 17 Nov 2015 17:28:59 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 0FE9D480A3; Tue, 17 Nov 2015 17:28:59 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 0834E480A5; Tue, 17 Nov 2015 17:28:59 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id TAF09035; Tue, 17 Nov 2015 17:28:59 +0900 X-IronPort-AV: E=Sophos;i="5.20,306,1444662000"; d="scan'";a="199951421" Received: from mail-sg2apc01lp0248.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.248]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 17 Nov 2015 17:28:58 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SG2PR06MB1017.apcprd06.prod.outlook.com (10.161.9.25) with Microsoft SMTP Server (TLS) id 15.1.325.17; Tue, 17 Nov 2015 08:28:56 +0000 Message-ID: <87h9klhw5e.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown <broonie@kernel.org> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 17 Nov 2015 08:28:56 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0008.apcprd02.prod.outlook.com (25.164.90.146) To SG2PR06MB1017.apcprd06.prod.outlook.com (25.161.9.25) X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1017; 2:pLD8BliKDGSd0CAuVeSW8TyQr78o7b1sLrJYI6tXtbLi5fJR1WZrU/Fus++dS5uvSEGO1PZbkbi8Db3EhvRAWFBNmlebzWz+etOnF61cJWZWIfrCmDcSUmBq/9ZVPcsu+6kFoVqGiJQi4DUZGcZAeI8xFnGgEop+hU4zRWpWbdo=; 3:Pb+2q5s50PgrnYrY3rZMzTNMsyMOgUpF8jj4R/S3TAgpAPiOSGpBbvqLaPnTJxruLN+mE/EybDpFbmO4EPl4LGggl2z9cXZ2OX1buuPMJq/g576U7zA3YR2/5p61EY7qoQ8TIdaEYbOvALaFYi8x4Q==; 25:lTjxtxFYw0zAR3Bqj4SIGFdOi4NJNWIhWHlcr06NQ8ltV7V3FkyCpT2E06J0LMzASrCYa3v+8pIMWewcWL+giRNb/Nhy2Me77M2wbbNaiwHJmLy7dcaS6nBS30ySOKZ3wcB+odTn1OutlTJxNpu0LzxRBuQ81i91rZsZyECZ9KsStPnezisE68JkwSlo200DHI3NuNb64/zlHZecUvw7Bxc6IYdo0LQX/xDdEkAzt5K4+lQ1j1Gb83IdSVzRWl4CztckmYmZVhHW34Fwxkbr0A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1017; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1017; 20:Ye1yyDvhFom41NvZDEV6Tuf6LfFjAQeUrKhUQ1TbIf0wSx/KHscWM5b1DGvtUURadYjHPVrjdVYZhvdvvrFwMqjOCU5Yr5sqS75Dw4R0rcBpwTiBCeRmANGh5DMc/9pfM1aR1oHsVkxPXvhuauWr3oCb764Ac41Giw6W4BguGwKs7rtVrqZVnA6Gir0LG47h5BrvsJes4N+uFQVDjizHqehPK3n2rn/4dKakIg7qraCBAWkp7xiB94Ar5p/yJ66OgTwciM3T/DqVguvUlcF0rnTJC9N8LpS1pfyepA0XqjO2gHn91nKC7+a0tKayFms/XIc8Gd9iwg2beCWisvEKdI5togk1jZ/mXcPsktPgbVb1g8uMRRFZWlyDrj+Dk7NliDGLNAKDiGk/w/zyqd/wB7tisItYsxXgp+KI/t1mTgNEXMwNzlUENIb1JHMxdwYDfa+GL3S/LuFS0C+OPGiO+Ri+r0Cnbj5AR1LbA38yZ177EQMi6Bqf7rfR2DKX0dwf; 4:g5lvnsb06+q5DRpY6wr0cgfTtlHrLLz1xp5Ve5r0A+m3kCnQ1Vv6+fKv9dFCU4sBJJrvbSjh5PhZGJbwG1QEUkZ/4oXwaQQKblk6+aYr2a4NUQ45vrA50RCEc8I2Em0qv7YC+ZVMnuON4ip5/8Q8f4SxzM5JBRut4znc62r29cp2T/LRblpNMmb9jyMeLhe5+l/jviRyUUE2gHuaLN1007Qj6WD4HD6hCHfQOPAzGm95+394ejpyUyJjUU/BLSn9C9ycpU8ZtDpvZbIPRMffl0SWObs5XsasWVHzCrHkdNwZZpAQzR6fewCavLk1SHEPoD0vEV9y0MevMNv8QAZ8a5FHPpwt4Lz1j+DtwRkf/StBAI4H6RBglj3m7d22NCG5 X-Microsoft-Antispam-PRVS: <SG2PR06MB1017A70F1EBA1292F56E59CBD41D0@SG2PR06MB1017.apcprd06.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(85106069007906); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(10201501046)(3002001); SRVR:SG2PR06MB1017; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1017; X-Forefront-PRVS: 07630F72AD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(46406003)(50986999)(50466002)(19580395003)(77096005)(42186005)(86362001)(54356999)(53416004)(69596002)(23726002)(586003)(101416001)(19580405001)(5007970100001)(66066001)(106356001)(40100003)(5001960100002)(229853001)(5004730100002)(87976001)(4001350100001)(92566002)(122386002)(97736004)(47776003)(189998001)(83506001)(105586002)(81156007)(110136002)(5008740100001)(33646002)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1017; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB1017; 23:pc3tbSXBfULiYJe3AXctNDQwsY8wSC9PQ3ys9Thpg?= =?us-ascii?Q?btbl3MMuzqbAn6HKqXVX+tM6l/abNliotlx7vQQ3xYVDP8pvVZzxEf8/JEs6?= =?us-ascii?Q?TMR55tAc6Z8oMsZ/1fu9VQUk/XzNcBUJxAeVGRF2YTD55WykPuqGVXEq1v7e?= =?us-ascii?Q?4tWFlXOOct3Se9DE1DA7s6fUGnP9BtZlOZ/+g2MDOt/eyKMSoRIE7mNiiJ3A?= =?us-ascii?Q?0ExZIPRFx2l9feGVMR16gzfNSh/tYW6ugroNQwAEpJEvU5Ko9QCR8SeuqeWE?= =?us-ascii?Q?UsNOf3fgEagAspytcicJft2RjQIIQUI1CrfgfipBC8wFokytZTRPSmtFoPNv?= =?us-ascii?Q?zZMSFRauT6X8bvoLV2crivviRAE2CwFX6Xfi7sqj3xqmxYIswTyZsUUXxebr?= =?us-ascii?Q?gJidqOYRHSra960K5yfgiSVXA8d0nvEJ0UUPB7AEK4XijKspBi+8c6KpPAjz?= =?us-ascii?Q?XAvrhlSBk0qSnMzEgZz8XT+siQ1w9DdkSGXhYaP0JOXjchh45/sajlcUQt5k?= =?us-ascii?Q?KPe88eO1cetCOBPIP3sGh6smgZ57v+BwaRcpqaCT4XpQGo5g1eFPFcg9jP93?= =?us-ascii?Q?I4PMsWj0DR9zg7MI3LJCiWpNoYqSAq3UObHt3qMq+++ZO9dSqmAr/73VVktG?= =?us-ascii?Q?07x+QmzjAO1b9yZhJqlmiVChfv3WMgXQm/tvy8qqj0doh2v1QHHbcuqGn78e?= =?us-ascii?Q?Za2/TE3TzoqtHeyxXDfL9xVNawuUxCDad+36wK5reg9kMkK1QVCF5gvBVXxS?= =?us-ascii?Q?pcNTbTWub0LeVy4KcYjYXguc32sgrrKcEW5NRJnbYzl6RZo7tdAXjs7wL1Eb?= =?us-ascii?Q?a+QXM4fagpOXVJ9kMp1eQlP+D68Ltgfuui9eO1DO53fcSreIYRFewI130Top?= =?us-ascii?Q?NVj8EaFEr0KkDS16TS4rxY2zUn2sWgFa80pwSnvCl/IrTfHC1Y5wlWKK+VDT?= =?us-ascii?Q?pTmXzsXTRr2YiBP/ebZnXwifFRvi71bOnHAMZYzo7rJUSPVWUvT+sK0Hi6AZ?= =?us-ascii?Q?JFBJoz8hDjO3jcFwq3sNu4L1I/E6zjP9IOydIq6YILYcg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1017; 5:zfdn3XE6OrnsTnscAznRyaFB+jIX1W7wqr6WrCjk8e47q0aAeiS3HDGOZxFSkpkKIR41K0RisX+gwfUq0Fok/Gd7OdSVP2XVBeu0slO6iMaMg1OBxBIUKuGtOXXGyFCI6mist6fze7obnGjP17qTMg==; 24:hCZy+yl9B7TXlNtFnr5uEmYA2cvo+YSTiuHhg+3WZs8QW11ksn3DZrcugr83eCpJEgdtJAzMEdjhR1s6wM7zQx3TnyyEw85Qkvih5JfGhh8=; 20:epoit/5sTAZZiSBtH8dCPqW6DH0LPY0D+2NyXC55tuwu3R2rZvli2kClFNNWtQuz0K4EhOlbje6hw3BVrdWCFc+NCNvNdxzRPyS/5+jRAea/wCWYFxR1nQznO+W+XMr/Cm2MyJTPe5Pwuu6Euek78aV7lYWg/0V3q7rNpkSph3U= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2015 08:28:56.1502 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1017 Cc: Linux-ALSA <alsa-devel@alsa-project.org>, Simon <horms@verge.net.au>, Liam Girdwood <lgirdwood@gmail.com> Subject: [alsa-devel] [PATCH] ASoC: ak4613: don't overwrite CTRL2 register 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" <alsa-devel.alsa-project.org> List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/> List-Post: <mailto:alsa-devel@alsa-project.org> List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index dab1276..62c08a6 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -70,6 +70,7 @@ #define FMT_MASK (0xf8) /* CTRL2 */ +#define DFS_MASK (3 << 2) #define DFS_NORMAL_SPEED (0 << 2) #define DFS_DOUBLE_SPEED (1 << 2) #define DFS_QUAD_SPEED (2 << 2) @@ -361,7 +362,7 @@ static int ak4613_dai_hw_params(struct snd_pcm_substream *substream, fmt_ctrl = AUDIO_IFACE_TO_VAL(iface); snd_soc_update_bits(codec, CTRL1, FMT_MASK, fmt_ctrl); - snd_soc_write(codec, CTRL2, ctrl2); + snd_soc_update_bits(codec, CTRL2, DFS_MASK, ctrl2); snd_soc_write(codec, ICTRL, priv->ic); snd_soc_write(codec, OCTRL, priv->oc);