From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EB8AC43603 for ; Mon, 16 Dec 2019 18:05:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7775C20700 for ; Mon, 16 Dec 2019 18:05:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576519516; bh=C3V6fzHrHzYV1IRhTy5yDuVUBK+biQRQLTTXNfh6xjo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=M0XwLl/xZoLXyH1TaZLuAuLkMpaQykKLEnb7lh8iEiW5FzHCmVTwJLSitzsiMl1tm jaFpUaWILMkmSOisd1Yh07GoB7EHrk79dbbxiJzJ1ASV2zIdA8eBYtqXvCIBGpxCXR mYSv9l2LGNophgyqahXCFhaLsF3ImBpkpymR/9tU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729794AbfLPSFP (ORCPT ); Mon, 16 Dec 2019 13:05:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:43222 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729120AbfLPSFM (ORCPT ); Mon, 16 Dec 2019 13:05:12 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 65A4E206EC; Mon, 16 Dec 2019 18:05:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576519511; bh=C3V6fzHrHzYV1IRhTy5yDuVUBK+biQRQLTTXNfh6xjo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EhmkEzc6yuwAEZxV659zsE8KddDG6guNuaaeP6xhqLdtMCQPtSybusQREfmwZZg1N a6/ZxwRe8GHyVeLMtjmBSeMImCFyrNnpqsiWmUAIys0mxXfxP6RhAOeqtWmhqa0r/c BwnJZhFfh/jnd8BrSf3frjhvysa/1mlsoIt/q3xQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jacob Rasmussen , Ross Zwisler , Mark Brown Subject: [PATCH 4.19 055/140] ASoC: rt5645: Fixed buddy jack support. Date: Mon, 16 Dec 2019 18:48:43 +0100 Message-Id: <20191216174803.358512775@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174747.111154704@linuxfoundation.org> References: <20191216174747.111154704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jacob Rasmussen commit e7cfd867fd9842f346688f28412eb83dec342900 upstream. The headphone jack on buddy was broken with the following commit: commit 6b5da66322c5 ("ASoC: rt5645: read jd1_1 status for jd detection"). This changes the jd_mode for buddy to 4 so buddy can read from the same register that was used in the working version of this driver without affecting any other devices that might use this, since no other device uses jd_mode = 4. To test this I plugged and uplugged the headphone jack, verifying audio works. Signed-off-by: Jacob Rasmussen Reviewed-by: Ross Zwisler Link: https://lore.kernel.org/r/20191111185957.217244-1-jacobraz@google.com Signed-off-by: Mark Brown Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/rt5645.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3307,6 +3307,9 @@ static void rt5645_jack_detect_work(stru snd_soc_jack_report(rt5645->mic_jack, report, SND_JACK_MICROPHONE); return; + case 4: + val = snd_soc_component_read32(rt5645->component, RT5645_A_JD_CTRL1) & 0x002; + break; default: /* read rt5645 jd1_1 status */ val = snd_soc_component_read32(rt5645->component, RT5645_INT_IRQ_ST) & 0x1000; break; @@ -3634,7 +3637,7 @@ static const struct rt5645_platform_data static const struct rt5645_platform_data buddy_platform_data = { .dmic1_data_pin = RT5645_DMIC_DATA_GPIO5, .dmic2_data_pin = RT5645_DMIC_DATA_IN2P, - .jd_mode = 3, + .jd_mode = 4, .level_trigger_irq = true, }; @@ -4030,6 +4033,7 @@ static int rt5645_i2c_probe(struct i2c_c RT5645_JD1_MODE_1); break; case 3: + case 4: regmap_update_bits(rt5645->regmap, RT5645_A_JD_CTRL1, RT5645_JD1_MODE_MASK, RT5645_JD1_MODE_2);