From patchwork Mon Mar 15 13:54:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 400468 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp3465427jai; Mon, 15 Mar 2021 07:20:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmaAsP2t4+9+523WIyMbjrPPAOrceUQBKnY/A4G54zHfSzr1T5S/DES/tELxHwCNg55094 X-Received: by 2002:a50:f113:: with SMTP id w19mr29663600edl.226.1615817621921; Mon, 15 Mar 2021 07:13:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615817621; cv=none; d=google.com; s=arc-20160816; b=P6XoFpvu5al7FVnAJHoFkQtyS2hb5HjhLQkr0iq56ay7Hvw4iwwuqwewUFunJryleo Ba5Ddc01bqi1FI0Nkq+NtzPl6ATNShiztjLPwBAt0F/ruq2b2YOz2pMfC6ptbf0XGovZ lgq1fcAnwlbm5qiWPSizZ3WRemwCAsjoBuMYhxFiU5x+OhMpuwKiv9ycbd5bDhjvhOeL MN23E6bmQzjs4TtvDGR9TBlztDJlOdzqPGsi5rmnWTghGlFcllrFyYWFKbgnYHeX1JjV wjwZGlfYnbuNKUMFzfrSXfVzhcklkRFbWoIaqGBLFkBalOrU/V7FcCuZEDDukyTC4tw9 FiWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mIxFmNoQBa/GbVMPbTuJY5njBJ/2ynOkzAVnK4xETMo=; b=1Dbm924qxHAFsMee0uoupt4HNq5mC7oZUWCdPasFMJbnrQrShsoOrnPOuIzL1vAlX2 4H5aAcFiQGIRRMFzxAt7KatFq0aakmhQkiCa61LF67uC0fUuqjeVcBarUjQ7xII9t8AP XH+50dfhUcsxRUL0yKuIVssrtWuAQLL9kFYJXqqI1Wgr8gYHBOQMOzUIQZih/thgsuhE cqP9Gvn98RTo7G1IqBgkrwD4QL5CDzAlEwwcU+wgfgwQNbV0iYP/ZC4kRwWrCbCBdJHw LjzVmDQFVFCKzbf5VFO+E8UWIsW3vNnoNRY6u0GQxmfIsMS/C+to5MTXkiFqbcY+qWV6 CB+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=irE2G8pq; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h21si993553ede.37.2021.03.15.07.13.41; Mon, 15 Mar 2021 07:13:41 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=irE2G8pq; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232070AbhCOOGa (ORCPT + 12 others); Mon, 15 Mar 2021 10:06:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:37820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233437AbhCOOBl (ORCPT ); Mon, 15 Mar 2021 10:01:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id ABB0964EF1; Mon, 15 Mar 2021 14:01:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816883; bh=t2kXVhCygr/Irc8LjJKIfjkulQLJyD61VWf/iS374OQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=irE2G8pq1tucTngCACEU17q5NrJG4t4Sp/GMUPqpHV7Rjd08o141Q8d+yVoRmcfNj 5IuJ3TQwdCpzSw+sB1ZxZEhFft6oELMH4rZbMZasU6vki1dLhNIWk6ul4Rf7xK3Kq+ Y0hkcTTVAfs2HbvSG1YMYhPmPV98YNprrkIjJxFw= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeremy Linton , Ulf Hansson , Sasha Levin Subject: [PATCH 5.10 167/290] mmc: sdhci: Update firmware interface API Date: Mon, 15 Mar 2021 14:54:20 +0100 Message-Id: <20210315135547.545767872@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135541.921894249@linuxfoundation.org> References: <20210315135541.921894249@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Greg Kroah-Hartman From: Jeremy Linton [ Upstream commit c5b1c6dc13daec60405ecd31eaa5379a9f798fa8 ] The device_* calls were added a few years ago to abstract DT/ACPI/fwnode firmware interfaces. Lets convert the two sdhci caps fields to use the generic calls rather than the OF specific ones. This has the side effect of allowing ACPI based devices to quirk themselves when the caps field is broken. Signed-off-by: Jeremy Linton Link: https://lore.kernel.org/r/20201120233831.447365-1-jeremy.linton@arm.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.30.1 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 3561ae8a481a..6edf9fffd934 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3994,10 +3994,10 @@ void __sdhci_read_caps(struct sdhci_host *host, const u16 *ver, if (host->v4_mode) sdhci_do_enable_v4_mode(host); - of_property_read_u64(mmc_dev(host->mmc)->of_node, - "sdhci-caps-mask", &dt_caps_mask); - of_property_read_u64(mmc_dev(host->mmc)->of_node, - "sdhci-caps", &dt_caps); + device_property_read_u64_array(mmc_dev(host->mmc), + "sdhci-caps-mask", &dt_caps_mask, 1); + device_property_read_u64_array(mmc_dev(host->mmc), + "sdhci-caps", &dt_caps, 1); v = ver ? *ver : sdhci_readw(host, SDHCI_HOST_VERSION); host->version = (v & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT;