Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3034275ybj; Mon, 23 Sep 2019 13:36:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqw5zUa6PLQrqIVWGkG1TRie4th4Y1dqnDC3qDD/0NS93tYJAwi8CpGcc2v1K3CLFc5ov3ne X-Received: by 2002:a17:906:3110:: with SMTP id 16mr1488384ejx.306.1569271015520; Mon, 23 Sep 2019 13:36:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569271015; cv=none; d=google.com; s=arc-20160816; b=UHpmFuxqPJ4V6W2dKImCzPcDaFRXDJZ5j4kWEiHUx7UZkcF/GxGYuwl98XghFCgrnT JFV12Y6kygq65TzxJt8J8XWaluwwi8bMDWXmVNh8pwVC7PFJZU0g/VOiO9mOfjWKR2bi GkQCMXu70DcnE2YgjWRk5n6YQjrl8ZpCmueso4wzZ4uFJMHvADJvN5C8tujq4tkxxMOr LQreqJRHe0Pq8FoujZV/jHweNk87VRJCQ2a+VH9a5d8ar7DTS2jWCS7yJ5dC/VIrEAnx 1e7DA0c877zDme3NmYneGCyNKDrxbwV24lfqWZVGae8l6F3YNxwt0NbZHf2QXVm/5ktA r0Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6peUumBr2JHaOiEzfCsEr9QQH0pQBANKAImw+7A8x2U=; b=ISJtWcwizvXEjLh+jiBemZ64Y9wuz+mBlTTSZ5AEWqE49CE/8k5RI/3Yccr2ZstLH6 3rTQKiphzSYdrpTzeEE15LM2pWWBzYwpwd263LObj7B0xB7ghW15ZhVUU9eQFCh68b4n wI4DEXdpPqGP5UJt1iTk0meXJTjytFiLyI09W/VmwSQxGflXuUfsm/9174L5UD+HgDow WyuJ1x/yY7LhDMJaBCFNOw0Giu1Rgx9q12uOEe03F+xot3FthvQXDKGEUk2q2A7gg7oC 78RZrNDZ7anbNJF8F4bkMVJoYVwk2PCHNuKFZuZvOEQBN7MB+L8W3a/KUfdCRhtlyyRg 3TCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Oix6q/4A"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gq15si5645836ejb.209.2019.09.23.13.36.31; Mon, 23 Sep 2019 13:36:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Oix6q/4A"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388696AbfIVSoH (ORCPT + 99 others); Sun, 22 Sep 2019 14:44:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:39654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388677AbfIVSoD (ORCPT ); Sun, 22 Sep 2019 14:44:03 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 02DA120869; Sun, 22 Sep 2019 18:44:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177842; bh=HpKmxHp4GDXcQxEKeyF+XGpwmGby9vwAK27uwuFCULk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oix6q/4AxDm+PJjUKAxHq+KXyvpZMvY4cYOuPiqkhwRcxgsf5aR+4t3+zA++POmDa QgRnl+QdGvop59jQB0IfQGngQdBnbf32BNrz15qZOiIeNZpDDUw6UJYruijxDp4ZVf +u7hLVb3dWmJ3Ep578RTQQc83fDJMqy7qypPwCOs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oleksandr Suvorov , Marcel Ziswiler , Igor Opaniuk , Fabio Estevam , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 5.3 010/203] ASoC: sgtl5000: Fix charge pump source assignment Date: Sun, 22 Sep 2019 14:40:36 -0400 Message-Id: <20190922184350.30563-10-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oleksandr Suvorov [ Upstream commit b6319b061ba279577fd7030a9848fbd6a17151e3 ] If VDDA != VDDIO and any of them is greater than 3.1V, charge pump source can be assigned automatically [1]. [1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf Signed-off-by: Oleksandr Suvorov Reviewed-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk Reviewed-by: Fabio Estevam Link: https://lore.kernel.org/r/20190719100524.23300-7-oleksandr.suvorov@toradex.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/sgtl5000.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index aad9eca41587e..7cbaedffa1ef7 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1173,12 +1173,17 @@ static int sgtl5000_set_power_regs(struct snd_soc_component *component) SGTL5000_INT_OSC_EN); /* Enable VDDC charge pump */ ana_pwr |= SGTL5000_VDDC_CHRGPMP_POWERUP; - } else if (vddio >= 3100 && vdda >= 3100) { + } else { ana_pwr &= ~SGTL5000_VDDC_CHRGPMP_POWERUP; - /* VDDC use VDDIO rail */ - lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD; - lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO << - SGTL5000_VDDC_MAN_ASSN_SHIFT; + /* + * if vddio == vdda the source of charge pump should be + * assigned manually to VDDIO + */ + if (vddio == vdda) { + lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD; + lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO << + SGTL5000_VDDC_MAN_ASSN_SHIFT; + } } snd_soc_component_write(component, SGTL5000_CHIP_LINREG_CTRL, lreg_ctrl); -- 2.20.1