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 A254DC3B187 for ; Mon, 10 Feb 2020 12:38:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 713C320733 for ; Mon, 10 Feb 2020 12:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338328; bh=dADVztZeb6G9viFvzKw+h3k0rY7ip4xnuV6dfLYV7rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dTLxjJA7R2TNTF+0UwM7ahM9Nn2FnAz2D7U72JVtr7vOR9QArPYIOilb1OtTgbKJh IRW8IuzeSxkk6cXy/aXkTCd4oYyrVw+R9xwllPTxefiritGkamgI4kef0z24KkpM5K LU8tZCl0y8d3/6Ufe/g9A4mXl2OGFzd5vqpcgYWM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728595AbgBJMir (ORCPT ); Mon, 10 Feb 2020 07:38:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:35040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729221AbgBJMir (ORCPT ); Mon, 10 Feb 2020 07:38:47 -0500 Received: from localhost (unknown [209.37.97.194]) (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 9317C24676; Mon, 10 Feb 2020 12:38:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338326; bh=dADVztZeb6G9viFvzKw+h3k0rY7ip4xnuV6dfLYV7rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZrVNbhWMO5/a/+fTd834LeCQog8COnLWQpfH3FwrpY0XHMZKeyCjvydWaobDgxQ79 yBZFAWPv2NDzVSmSZRXPS2LJlkzK2VrR3RE4bkBMmaVSNOS5MDOCFJgqYOjYh22oha Pm0S2JNtqg15ZmWBFANdLtRpYJwwBJfJc/FjPGfg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Vasut , Fabio Estevam , Igor Opaniuk , Marcel Ziswiler , Mark Brown , Oleksandr Suvorov Subject: [PATCH 5.4 262/309] ASoC: sgtl5000: Fix VDDA and VDDIO comparison Date: Mon, 10 Feb 2020 04:33:38 -0800 Message-Id: <20200210122431.838244642@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122406.106356946@linuxfoundation.org> References: <20200210122406.106356946@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Vasut commit e19ecbf105b236a6334fab64d8fd5437b12ee019 upstream. Comparing the voltage of VDDA and VDDIO to determine whether or not to enable VDDC manual override is insufficient. This is a problem in case the VDDA is supplied from different regulator than VDDIO, while both report the same voltage to the regulator framework. In that case where VDDA and VDDIO is supplied by different regulators, the VDDC manual override must not be applied. Fixes: b6319b061ba2 ("ASoC: sgtl5000: Fix charge pump source assignment") Signed-off-by: Marek Vasut Cc: Fabio Estevam Cc: Igor Opaniuk Cc: Marcel Ziswiler Cc: Mark Brown Cc: Oleksandr Suvorov Link: https://lore.kernel.org/r/20191220164450.1395038-2-marex@denx.de Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/sgtl5000.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1344,7 +1344,8 @@ static int sgtl5000_set_power_regs(struc * if vddio == vdda the source of charge pump should be * assigned manually to VDDIO */ - if (vddio == vdda) { + if (regulator_is_equal(sgtl5000->supplies[VDDA].consumer, + sgtl5000->supplies[VDDIO].consumer)) { lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD; lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO << SGTL5000_VDDC_MAN_ASSN_SHIFT;