From patchwork Wed Sep 1 12:28:21 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: 505079 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp224375jai; Wed, 1 Sep 2021 05:52:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzV125uf+Y78MLeVUktlj8nwCjsyCuRVPuoVrtTFyNepb2ZgOXQxc7u1CqrgkAPkI5ENr0V X-Received: by 2002:a02:cebc:: with SMTP id z28mr7899442jaq.49.1630500642899; Wed, 01 Sep 2021 05:50:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630500642; cv=none; d=google.com; s=arc-20160816; b=dL5VV74XKEcrYq7RJdZiwCxMDHE0Ccf/Zk/Fg/vewetjg9VbFTpj9QZcPM1xQTcoF/ Lv9UfL0fNx4ZD05eBarTA4UfikAlumI4EYe4dye1XNyGGE209/ufH+7bKe04/lBdmOkt P4X3N9b+gRgoNfBk+lxRZEW2E7k3YVF88ykQkErNGCcPH6TiAy1UNVkEC6PJ2AicWpBf 9fwsCohk+WYE61AhA42hMZAldFSobxDPb57DP4lvLECGGw4qdG3HS2h4SLrmhY7z3uKw Dp7I8I6h5vYb+UtBQXpFyva/fYDXovWkxIXsVgUylR2/b2Sb70ouUvfpYh+muiuEQabh Gzew== 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=XPImsPdbyKwwLp5uytqxUO4V9okeLw2hYpfUpCU2VtLpgr4Z7s5qGvS5K7NNEjQxfp pG/Ze7rNeHt0q0M4e1wibGoVOs02WEJZYjdH14Hh4caSDeODB46kSGB7+oYbArnfEvBx rML1HzT/1zlqYlY2TjJm6X0GjwzEiy41K40o0eTDXIZisdvbrmgd0ub/bAPbb+C0dxz8 9ZqQybe4GQTOD/3SDPcAPfhRYUdiumgE+MSI68McpAU3TYlr3QrrocVl3+PI4TLIubkN z8oX5xUYtTqZ6+zANNa14ou5tR/Kur2ZdAWZ1BapOBKapCCzwHwnJ7obKCJz5Bg+S2PU MSsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rjUg9NxT; 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 l5si1116439ioa.54.2021.09.01.05.50.42; Wed, 01 Sep 2021 05:50:42 -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=rjUg9NxT; 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 S1345951AbhIAMv2 (ORCPT + 11 others); Wed, 1 Sep 2021 08:51:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:54320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346406AbhIAMuL (ORCPT ); Wed, 1 Sep 2021 08:50:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 23AC560C3E; Wed, 1 Sep 2021 12:41:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1630500091; bh=euou5dDXYWLl5efyDSdIq244YaYvwvkg/kzzcPJzSD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rjUg9NxTauYs6WEga1fYWCsqhb/ESr5WfKujW4MUu6U7jAvSgZrK+6WKqj8grrXaa 2sUwZdISgEN4Uq8K8X71XOOBocI+DEWQGEvyh7m7/lN788HrIIMDp6xo+ggcG0DIdy QTN9/MLO2KDcAZf1iid4O3/GLKX3j8ze/0D8+I8Y= 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.13 066/113] Revert "mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711" Date: Wed, 1 Sep 2021 14:28:21 +0200 Message-Id: <20210901122304.182401203@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210901122301.984263453@linuxfoundation.org> References: <20210901122301.984263453@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, };