From patchwork Wed Sep 1 12:27:56 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: 505069 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp214623jai; Wed, 1 Sep 2021 05:39:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykUHoZFNAXHOka9xS9I7QM7YlmREuE+4Rzimg7x1YZTWTj5p+1CqtRGuH5lvlg2tFeX0CD X-Received: by 2002:a92:8e41:: with SMTP id k1mr23931091ilh.232.1630499996945; Wed, 01 Sep 2021 05:39:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630499996; cv=none; d=google.com; s=arc-20160816; b=KYQw0Zi9icaB4K4kv4vLDwa+J/aJWAf8O/JJ08WCyj63QCNLOwIsU+cMCfhhCiIn13 wPAI72Yd6mTB38eetxjoMFPZ604xJoX2Nq7EhG+xoOeZ3/+F2relrm7ySQSr4h05J+se 4fa90j3qDWamuSzgkzGMhyzig4Sc57HTdX2HKtmhiacfls7oNN0ZkXa2It24SQoUz/7H XyH7BPKxNCVU9AtTgOEckrzpOp9BexM8pM6s/RimaHTB6+OVxTa639FhoPy5BcUpUvBl SfFJuSV0jsBd04NaF9eFqw0NR4vVGh3okxzrpExZW5O2QmPsIfqGRxKYf54zw3FZGEBN xhqA== 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=9kyffFdZk2QUH4nN4pL6c4yL6pngF1tRFQH/sEYDx9g=; b=NkEGyGuyEIPIVOHqCa1z+YOO9rECKqFMkME7p8xZWu6XC0qhhfw9xx5zq2B0KpJdOa 5DQyTW1qfOwRzr2WP68LwLZdCIU3WSjyQRasQskGNSTYmQL4VtAmk5g0BH4ccBviY/6z XhM6W7c1KrU6jIQbISJYaenImptL4hHvvkjEcUywCwchzO1ycMZTzIoLojtwMoXBZBbZ 4H2BcSTqidjS4jIfo5CNxXrzrLI9UbEdHm19Xg98GeNigknc56hGfEQSt3Kn0ujvN3HD gqkIQdtmpjSQQ9mwwGCVLYYrqIxjE7GMOQKZeZyZopfDUFsVKH5KMa5QmUp6flvkJ477 3/4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="D9QunZ9/"; 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 i12si1126684jaf.41.2021.09.01.05.39.56; Wed, 01 Sep 2021 05:39:56 -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="D9QunZ9/"; 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 S1345119AbhIAMkq (ORCPT + 11 others); Wed, 1 Sep 2021 08:40:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:43544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343845AbhIAMi0 (ORCPT ); Wed, 1 Sep 2021 08:38:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C98D3610FB; Wed, 1 Sep 2021 12:34:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1630499687; bh=euou5dDXYWLl5efyDSdIq244YaYvwvkg/kzzcPJzSD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D9QunZ9/07HayELj1sKDOawX3Cp8lx3eFd9Vqfo6dDfFvXBxn8y57r9sVWw1vTWw0 Wa89mp/bLF/kd4tCcvh7LcKLHPtHNDYMXwi6/xlzPd91G4UXj2xTbEdzdP+Bknorrs Ixs3gE9xJgj5pZPmF8zbLXQWlJwjxY7VRA3PuNG4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeremy Linton , Stefan Wahren , Ulf Hansson , Sasha Levin Subject: [PATCH 5.10 046/103] Revert "mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711" Date: Wed, 1 Sep 2021 14:27:56 +0200 Message-Id: <20210901122302.125598475@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210901122300.503008474@linuxfoundation.org> References: <20210901122300.503008474@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ulf Hansson [ Upstream commit 885814a97f5a1a2daf66bde5f2076f0bf632c174 ] This reverts commit 419dd626e357e89fc9c4e3863592c8b38cfe1571. It turned out that the change from the reverted commit breaks the ACPI based rpi's because it causes the 100Mhz max clock to be overridden to the return from sdhci_iproc_get_max_clock(), which is 0 because there isn't a OF/DT based clock device. Reported-by: Jeremy Linton Fixes: 419dd626e357 ("mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711") Acked-by: Stefan Wahren Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci-iproc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.30.2 diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c index 9f0eef97ebdd..b9eb2ec61a83 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c @@ -295,8 +295,7 @@ static const struct sdhci_ops sdhci_iproc_bcm2711_ops = { }; static const struct sdhci_pltfm_data sdhci_bcm2711_pltfm_data = { - .quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 | - SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, + .quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12, .ops = &sdhci_iproc_bcm2711_ops, };