From owner-dev-commits-src-all@freebsd.org Thu May 20 09:22:40 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B7864639A67; Thu, 20 May 2021 09:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fm45X4gZTz4rvH; Thu, 20 May 2021 09:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 89428235D5; Thu, 20 May 2021 09:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14K9Menn058288; Thu, 20 May 2021 09:22:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14K9MeJV058287; Thu, 20 May 2021 09:22:40 GMT (envelope-from git) Date: Thu, 20 May 2021 09:22:40 GMT Message-Id: <202105200922.14K9MeJV058287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marcin Wojtas Subject: git: b08bf4c35caa - main - sdhci_fsl_fdt: Skip vccq reconfiguration without regulator MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b08bf4c35caa2baaa0453b7979ed538cf71b6de5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 May 2021 09:22:40 -0000 The branch main has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=b08bf4c35caa2baaa0453b7979ed538cf71b6de5 commit b08bf4c35caa2baaa0453b7979ed538cf71b6de5 Author: Marcin Wojtas AuthorDate: 2021-05-20 09:16:40 +0000 Commit: Marcin Wojtas CommitDate: 2021-05-20 09:21:53 +0000 sdhci_fsl_fdt: Skip vccq reconfiguration without regulator There is no need to preform any voltage reconfiguration in case the vccq regulator is not physically attached to the slot. Submitted by: Lukasz Hajec Obtained from: Semihalf Sponsored by: Alstom Group Differential Revision: https://reviews.freebsd.org/D30355 --- sys/dev/sdhci/sdhci_fsl_fdt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fsl_fdt.c b/sys/dev/sdhci/sdhci_fsl_fdt.c index 26092f662406..91d926c343cc 100644 --- a/sys/dev/sdhci/sdhci_fsl_fdt.c +++ b/sys/dev/sdhci/sdhci_fsl_fdt.c @@ -493,15 +493,15 @@ sdhci_fsl_fdt_switch_vccq(device_t brdev, device_t reqdev) struct sdhci_slot *slot; int uvolt, err; - err = sdhci_generic_switch_vccq(brdev, reqdev); - if (err != 0) - return (err); - sc = device_get_softc(brdev); if (sc->fdt_helper.vqmmc_supply == NULL) return EOPNOTSUPP; + err = sdhci_generic_switch_vccq(brdev, reqdev); + if (err != 0) + return (err); + slot = device_get_ivars(reqdev); switch (slot->host.ios.vccq) { case vccq_180: