From patchwork Mon Mar 15 13:53:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 400464 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp3462792jai; Mon, 15 Mar 2021 07:17:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzltBkq7KBaMKSa9tJSw25jarKZ9W4iT315m2UouliQLRc/sCURdEiZeKhiRCcXGdhWjItQ X-Received: by 2002:a50:ee05:: with SMTP id g5mr30137864eds.164.1615817483100; Mon, 15 Mar 2021 07:11:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615817483; cv=none; d=google.com; s=arc-20160816; b=NlvhZGASrJ7IFoQJ9+vg+MRIBaa5yWdKIsJHa0QQVG0CyrUqBvc6+BusQpOUoAYWmr En5SmEXDbTQoYyD4pi3XelNRxLIInAUD079TzfXndEX2/7knaWFl11BAwkkr+9mguIdg /6fqbSRZowRTmB5uZ/tyvXPm8LsLdgw8WY/dVDuoa5xP46F2prX+KT4pT07miJ8pT41+ KoKZpPPylpNib5ISWtb9Zy7H/lgIPBG5IOvsZGKo9ezPX/o2KudsPeec7PhPK86iCXXh yvzQJCvI8oDQMgsu/Jv8lRqEpy9tZ+n+HabzZfpYObPEO/giH1qQu8w13GpFzD9WKUlR zV5Q== 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=0yBAzaDosrnQiIeKbJfz+wOdp22jbK4oaLBnVE52sLc=; b=QMzPYB14GM/jsFTuKj+m4bRblWxZQWZ+hX68/5/z9gZtOsnOt/ol3qOGb8A34P3ZG8 FNo4ZRWCGG2qLXp2pqCRKLkR749ss+SILGbogaqXlO1myrxuQpI+rduufNAmvFcksDwL ABvufqwsV/Dd+NU/CmCPHbiKsx5c3AvEXq+/LrvZvEckWknF5UD178OV2PtNdehtfqST /UyPjESeODLa0T4TYez4GFuA85AIjPBYX8389gIGUAsZzqnjYnh/JIPV2nuVp2CjoCo5 H0cMjW/onYicwRrTpSCN9p8M/xm6+BCJs5U5AfifHdYmAyhkqlGJrZI74soik85M/dr9 DWjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="uZ/g/7D7"; 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.11.22; Mon, 15 Mar 2021 07:11:23 -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="uZ/g/7D7"; 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 S234820AbhCOOFn (ORCPT + 12 others); Mon, 15 Mar 2021 10:05:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:37476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233153AbhCOOAy (ORCPT ); Mon, 15 Mar 2021 10:00:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 20FBE64F8A; Mon, 15 Mar 2021 14:00:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816830; bh=8Ot3fnhF37NWp6SS6AiQuMpnw4SuJYw28xAlGF+me/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uZ/g/7D74w+ImoIeXAxhQLLnifgX3O/B59FufR0uFs6kPAuCf1NU4sTL1W11qhkW5 iMZ1+no6/7H8RFg78Y1f4mnBXt4eDuKMOQ5wEcJDWMNi/DUEqGwEM66q9N9pm7jaXq maRLcIxH5fcEJ0NX/tQQMfzZL9qC6XL7E7QEebLM= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeremy Linton , Florian Fainelli , Ulf Hansson , Sasha Levin Subject: [PATCH 5.10 138/290] mmc: sdhci-iproc: Add ACPI bindings for the RPi Date: Mon, 15 Mar 2021 14:53:51 +0100 Message-Id: <20210315135546.576777150@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 4f9833d3ec8da34861cd0680b00c73e653877eb9 ] The RPi4 has an Arasan controller it carries over from the RPi3 and a newer eMMC2 controller. Because of a couple of quirks, it seems wiser to bind these controllers to the same driver that DT is using on this platform rather than the generic sdhci_acpi driver with PNP0D40. So, BCM2847 describes the older Arasan and BRCME88C describes the newer eMMC2. The older Arasan is reusing an existing ACPI _HID used by other OSes booting these tables on the RPi. With this change, Linux is capable of utilizing the SD card slot, and the Wi-Fi when booted with UEFI+ACPI on the RPi4. Signed-off-by: Jeremy Linton Acked-by: Florian Fainelli Link: https://lore.kernel.org/r/20210120000406.1843400-2-jeremy.linton@arm.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci-iproc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -- 2.30.1 diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c index c9434b461aab..ddeaf8e1f72f 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c @@ -296,9 +296,27 @@ static const struct of_device_id sdhci_iproc_of_match[] = { MODULE_DEVICE_TABLE(of, sdhci_iproc_of_match); #ifdef CONFIG_ACPI +/* + * This is a duplicate of bcm2835_(pltfrm_)data without caps quirks + * which are provided by the ACPI table. + */ +static const struct sdhci_pltfm_data sdhci_bcm_arasan_data = { + .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION | + SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | + SDHCI_QUIRK_NO_HISPD_BIT, + .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, + .ops = &sdhci_iproc_32only_ops, +}; + +static const struct sdhci_iproc_data bcm_arasan_data = { + .pdata = &sdhci_bcm_arasan_data, +}; + static const struct acpi_device_id sdhci_iproc_acpi_ids[] = { { .id = "BRCM5871", .driver_data = (kernel_ulong_t)&iproc_cygnus_data }, { .id = "BRCM5872", .driver_data = (kernel_ulong_t)&iproc_data }, + { .id = "BCM2847", .driver_data = (kernel_ulong_t)&bcm_arasan_data }, + { .id = "BRCME88C", .driver_data = (kernel_ulong_t)&bcm2711_data }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(acpi, sdhci_iproc_acpi_ids);