From patchwork Wed Jun 2 19:27:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 12295609 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64BE5C4708F for ; Wed, 2 Jun 2021 19:29:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4A85F61009 for ; Wed, 2 Jun 2021 19:29:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229468AbhFBTbA (ORCPT ); Wed, 2 Jun 2021 15:31:00 -0400 Received: from mail-pg1-f178.google.com ([209.85.215.178]:39933 "EHLO mail-pg1-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229467AbhFBTbA (ORCPT ); Wed, 2 Jun 2021 15:31:00 -0400 Received: by mail-pg1-f178.google.com with SMTP id v14so3097600pgi.6; Wed, 02 Jun 2021 12:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=E8vUWtDMqWild8A9bhDL+wLNKgyTVijec3O63TtaCeQ=; b=lcRYqtVJnUHY3XGJzUhTrAMt6+htMorMfKLDgtbv7gFDaE7UOR0A6F8Sz+rkj/9cXz ZI8Qy6ex+BX4njn7BcGKpkZ6x0R/Huf9zI3SHHVp6EXb/fbcswxLdAIi+qXe5CMad45E IopNMdAERvpF750LZjepnuERSqxZf//Ax+yzy0idgWsxfN6HHezYIHbQXWw38N3SBiB9 adpyA0hdbU1B1zlvEsx662kQhnYkNteAL6HnNZozpxeeMVzXe4EQ+btrJe0Zr7G5+BYb FnN1YFaJhhn7m9Y8tgfDdFfiqGpNX3Pvu041VcJHCOI1AU6BRBkpN5TC9PT9g+1O5RP9 Ferg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=E8vUWtDMqWild8A9bhDL+wLNKgyTVijec3O63TtaCeQ=; b=jrPFeLaUeP8EMMwN1yE/amRKptMLcz0IpAULrtoFCMtdqNb/aSseXXAgFDhqbUZmJP qetCmQVKZzLKdovUdTeamT8vrbASZXLolvjwP7yInoOLYp71D8FD5fWdUHUeSfdWilbn 1Ntd5dz8WtRfZ32DbU/fgF0SC5X1c34vBgMfeG85t1SytNiI6W+D8wG2gnjz5TO9Gg3w fduGZrLeue1BKNem9a4Out/d7LnHHCdcsX2UIlPlDow+mxzbdTE9YmD7gJ03AFzcljuW TcJJLLi3a0ZaygkmsFw6pkub72Alj4sHPeTMOxgbUQ/a7hOMq0vRRF0CgV8a1N1Sfzp4 jRPA== X-Gm-Message-State: AOAM533k0gKNXE+6JHFo7pb9R5hCS9BvZvkzvNPAF7kOukG0R7H/98kO rbA5WdIGrdZtpAjvzswrrcT5hphM6pVHczU3 X-Google-Smtp-Source: ABdhPJxO+sxxmX4+zcVnKW/MU9yYAqFYdqQpz1Hm8ni98EnuVHOsLm3TI2xojKihsfJklMHX3tYQJQ== X-Received: by 2002:a65:60da:: with SMTP id r26mr35519014pgv.133.1622662096547; Wed, 02 Jun 2021 12:28:16 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id m134sm349882pfd.148.2021.06.02.12.28.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 12:28:15 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Al Cooper , Adrian Hunter , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, Nicolas Saenz Julienne , Ray Jui , Rob Herring , Scott Branden , Ulf Hansson Subject: [PATCH 1/2] dt-bindings: mmc: sdhci-iproc: Add brcm,bcm7211a0-sdhci Date: Wed, 2 Jun 2021 15:27:57 -0400 Message-Id: <20210602192758.38735-1-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Add new compatible string for the legacy sdhci controller on the BCM7211 family of SoC's. Signed-off-by: Al Cooper Acked-by: Rob Herring --- Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml | 1 + 1 file changed, 1 insertion(+) base-commit: 97e5bf604b7a0d6e1b3e00fe31d5fd4b9bffeaae diff --git a/Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml b/Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml index 6f569fbfa134..2f63f2cdeb71 100644 --- a/Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml +++ b/Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml @@ -21,6 +21,7 @@ properties: - brcm,bcm2711-emmc2 - brcm,sdhci-iproc-cygnus - brcm,sdhci-iproc + - brcm,bcm7211a0-sdhci reg: minItems: 1 From patchwork Wed Jun 2 19:27:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 12295611 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BCF9C47083 for ; Wed, 2 Jun 2021 19:29:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 46C36613F3 for ; Wed, 2 Jun 2021 19:29:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229604AbhFBTbH (ORCPT ); Wed, 2 Jun 2021 15:31:07 -0400 Received: from mail-pg1-f171.google.com ([209.85.215.171]:43734 "EHLO mail-pg1-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229595AbhFBTbH (ORCPT ); Wed, 2 Jun 2021 15:31:07 -0400 Received: by mail-pg1-f171.google.com with SMTP id e22so3088835pgv.10; Wed, 02 Jun 2021 12:29:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XzS7P5N5k8NA+I80eCjz5cao0sI4VjQkYkjsy3xGV2s=; b=XcmgsIbVOf1QZ7uTKgEMHSEjQ/6DN5FscfTVPa5dfmC9xGud8OWTtoQAmFp+yvb6GV rrgTaYQfEUwx1J19VajRnvPqP4cWtj3l2EJ9eb5Omx6+4k6XCpbK5daqPgiRuceV4x3t UIj5IgTSA7/0vU0CRrJYc5i9Hf3uPNH0+oGGjWtTRBZOC4dva5uHfKic/fOnmH2wUbgo uqAsaSBMeMYlCQZ6Sv2rytprJh5h8UES/7GU0N4Xy2VSya1yCix2S4Z3OrF8OSiymw/F 9uw7qPSSvZ5hqprNEK3CAUKyhvLQhPheW5C20N2nFy7j1jF+QnTLIN8yTj8bUpWZFYcm 73LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XzS7P5N5k8NA+I80eCjz5cao0sI4VjQkYkjsy3xGV2s=; b=HCIeYiU0xwImUquIxfzyvQKUdtgRPvCLZmmMUvd87diLLuCAXEkGYAGs+w7Z8Lhmn8 6tT2Bb+tuDmZBlOwnSXLCCd1ok8SP/00IhzBFrHn2y5yNA+6nVHtdZKgQBScAYUVYqiq iVtx89sqAMKOZKglo/pU/eDnu+2yX78PnM8+bUpQl1WWKfdwDwXpvTfoA37JAtB/c8X2 hGcs6Od0fx+Fo8i5D4hDtojAuxxB+26AkLBcC6Ya8ISiCufk3YL2i4NT8jEFHupjSopZ Qq1ZjwVZ6NrJsRM0IVCpzrp2jIrAS+JRyEXpoMQH+4odG8sh1kbIGYFOEMwCuUPn/lLe 5/0g== X-Gm-Message-State: AOAM533l9m/4/lbDNjlEXMyb1eTSFVgdTQ7+btwcLWu6Nz+i45Nv25FN EfTDHFU4rHSfr4bZQUNz6aUPS/Fa65/kriUw X-Google-Smtp-Source: ABdhPJzuX7PTrVxOwtB9BNIY51BbJrzkNV8t51Kl5odDi2X2XBDtb7Ecu3lYfyLom7NDDesosLlwyA== X-Received: by 2002:a63:5a19:: with SMTP id o25mr35092339pgb.122.1622662103231; Wed, 02 Jun 2021 12:28:23 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id m134sm349882pfd.148.2021.06.02.12.28.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 12:28:22 -0700 (PDT) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Al Cooper , Adrian Hunter , bcm-kernel-feedback-list@broadcom.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, Nicolas Saenz Julienne , Ray Jui , Rob Herring , Scott Branden , Ulf Hansson Subject: [PATCH 2/2] mmc: sdhci-iproc: Add support for the legacy sdhci controller on the BCM7211 Date: Wed, 2 Jun 2021 15:27:58 -0400 Message-Id: <20210602192758.38735-2-alcooperx@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210602192758.38735-1-alcooperx@gmail.com> References: <20210602192758.38735-1-alcooperx@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Add support for the legacy Arasan sdhci controller on the BCM7211 and related SoC's. This includes adding a .shutdown callback to increase the power savings during S5. Signed-off-by: Al Cooper --- drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/sdhci-iproc.c | 30 ++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci.h | 2 ++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index a4d4c757eea0..561184fa7eb9 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -412,7 +412,7 @@ config MMC_SDHCI_MILBEAUT config MMC_SDHCI_IPROC tristate "SDHCI support for the BCM2835 & iProc SD/MMC Controller" - depends on ARCH_BCM2835 || ARCH_BCM_IPROC || COMPILE_TEST + depends on ARCH_BCM2835 || ARCH_BCM_IPROC || ARCH_BRCMSTB || COMPILE_TEST depends on MMC_SDHCI_PLTFM depends on OF || ACPI default ARCH_BCM_IPROC diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c index ddeaf8e1f72f..cce390fe9cf3 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c @@ -286,11 +286,35 @@ static const struct sdhci_iproc_data bcm2711_data = { .mmc_caps = MMC_CAP_3_3V_DDR, }; +static const struct sdhci_pltfm_data sdhci_bcm7211a0_pltfm_data = { + .quirks = SDHCI_QUIRK_MISSING_CAPS | + SDHCI_QUIRK_BROKEN_TIMEOUT_VAL | + SDHCI_QUIRK_BROKEN_DMA | + SDHCI_QUIRK_BROKEN_ADMA, + .ops = &sdhci_iproc_ops, +}; + +#define BCM7211A0_BASE_CLK_MHZ 100 +static const struct sdhci_iproc_data bcm7211a0_data = { + .pdata = &sdhci_bcm7211a0_pltfm_data, + .caps = ((BCM7211A0_BASE_CLK_MHZ / 2) << SDHCI_TIMEOUT_CLK_SHIFT) | + (BCM7211A0_BASE_CLK_MHZ << SDHCI_CLOCK_BASE_SHIFT) | + ((0x2 << SDHCI_MAX_BLOCK_SHIFT) + & SDHCI_MAX_BLOCK_MASK) | + SDHCI_CAN_VDD_330 | + SDHCI_CAN_VDD_180 | + SDHCI_CAN_DO_SUSPEND | + SDHCI_CAN_DO_HISPD, + .caps1 = SDHCI_DRIVER_TYPE_C | + SDHCI_DRIVER_TYPE_D, +}; + static const struct of_device_id sdhci_iproc_of_match[] = { { .compatible = "brcm,bcm2835-sdhci", .data = &bcm2835_data }, { .compatible = "brcm,bcm2711-emmc2", .data = &bcm2711_data }, { .compatible = "brcm,sdhci-iproc-cygnus", .data = &iproc_cygnus_data}, { .compatible = "brcm,sdhci-iproc", .data = &iproc_data }, + { .compatible = "brcm,bcm7211a0-sdhci", .data = &bcm7211a0_data }, { } }; MODULE_DEVICE_TABLE(of, sdhci_iproc_of_match); @@ -384,6 +408,11 @@ static int sdhci_iproc_probe(struct platform_device *pdev) return ret; } +static void sdhci_iproc_shutdown(struct platform_device *pdev) +{ + sdhci_pltfm_suspend(&pdev->dev); +} + static struct platform_driver sdhci_iproc_driver = { .driver = { .name = "sdhci-iproc", @@ -394,6 +423,7 @@ static struct platform_driver sdhci_iproc_driver = { }, .probe = sdhci_iproc_probe, .remove = sdhci_pltfm_unregister, + .shutdown = sdhci_iproc_shutdown, }; module_platform_driver(sdhci_iproc_driver); diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 0770c036e2ff..c35ed4be75b7 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -201,8 +201,10 @@ #define SDHCI_CAPABILITIES 0x40 #define SDHCI_TIMEOUT_CLK_MASK GENMASK(5, 0) +#define SDHCI_TIMEOUT_CLK_SHIFT 0 #define SDHCI_TIMEOUT_CLK_UNIT 0x00000080 #define SDHCI_CLOCK_BASE_MASK GENMASK(13, 8) +#define SDHCI_CLOCK_BASE_SHIFT 8 #define SDHCI_CLOCK_V3_BASE_MASK GENMASK(15, 8) #define SDHCI_MAX_BLOCK_MASK 0x00030000 #define SDHCI_MAX_BLOCK_SHIFT 16