From patchwork Fri Nov 20 23:38:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 329158 Delivered-To: patch@linaro.org Received: by 2002:a92:ae0b:0:0:0:0:0 with SMTP id s11csp307192ilh; Fri, 20 Nov 2020 15:39:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJygXnMDzrwRKLYKeltqxN10yag7jTjcdaohFFAcyBwowbUOIMMlxO3wFCW7RmoAD80PpkrG X-Received: by 2002:a17:906:a052:: with SMTP id bg18mr36681582ejb.550.1605915568000; Fri, 20 Nov 2020 15:39:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605915567; cv=none; d=google.com; s=arc-20160816; b=LOuQI47E1RtmOPyVjhU8/iwt6CK9l9NMDXQytYEgFz0OJ6nnrdUyKeSPz1rTo8a8rn BdDf/sIjksqoMjvNZriyt6sb8UlCpE8mRX+5se5vYVo7RbBJprfmnRvJGW2Fza6s/Hp4 I7R3Ybmzw+WaEzJMgI76WHHUwLTzb1oEtf5VNg1ahq/fEWfTgV4jObeOzKPZPguXGFAq pc7pe9PKUt5T8l6SxWAqW6sa9+hbAQBqNeb57gpdT61HGe1NdlwEEay1WKTQlUKkVrai ffINl7UN05fzCKjlnakyMQtL2nukHB/DCbLRlTWdVgYGxv91oxjKTee994PZ5YX1iBku ssjQ== 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 :message-id:date:subject:cc:to:from; bh=TTU4IeG2f9PeKe0GrHSSckGxuUAAYyc+7empcriQzGk=; b=WYYdnm+55srNACGEIzE3mgdcq+B1WaGYY9WHXjjCGKbO+ppOrP3pSGJKhlPYjIJPQa Crz9bOLRHkGuVF2uy0SLtuYMuhjLbDz90ouQ3JiEZsQRDFbcLuGD7tN28TJa3fIzMZNj uHxqsfl2sgPlm2qw8fN2Cqkc1o/8PDoDxbAWUJ9c0p4G1mpJnHFfP5dxZIrMXWKWOUex rO70+L89qTqsyIKXutLKyGCW385MCMESz3RNeE4awDzaD3yaOnL1O+UN1k23xQbsWZ9+ Q/5Z6ehL1EowxPrFnlIsDY9qDbAv71qJuJrgVCjfEv4uSNobtaCrZlnqHnEK6t918ByV 3K7w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-mmc-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b13si2672898edt.209.2020.11.20.15.39.27; Fri, 20 Nov 2020 15:39:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-mmc-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-mmc-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728124AbgKTXjK (ORCPT + 4 others); Fri, 20 Nov 2020 18:39:10 -0500 Received: from foss.arm.com ([217.140.110.172]:56346 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726255AbgKTXjK (ORCPT ); Fri, 20 Nov 2020 18:39:10 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4740F1042; Fri, 20 Nov 2020 15:39:09 -0800 (PST) Received: from mammon-tx2.austin.arm.com (mammon-tx2.austin.arm.com [10.118.28.62]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 379FD3F719; Fri, 20 Nov 2020 15:39:09 -0800 (PST) From: Jeremy Linton To: linux-mmc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, adrian.hunter@intel.com, ulf.hansson@linaro.org, Jeremy Linton Subject: [PATCH] mmc: sdhci: Update firmware interface API Date: Fri, 20 Nov 2020 17:38:31 -0600 Message-Id: <20201120233831.447365-1-jeremy.linton@arm.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org 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 --- drivers/mmc/host/sdhci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.26.2 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 592a55a34b58..feba64fbde16 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3992,10 +3992,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;