From patchwork Wed Jul 24 14:39:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1136365 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=balena.io Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45tyjV5JXbz9sBF for ; Thu, 25 Jul 2019 00:42:06 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 77213C21C27; Wed, 24 Jul 2019 14:40:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A24EDC21DB5; Wed, 24 Jul 2019 14:40:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4193AC21C2F; Wed, 24 Jul 2019 14:39:42 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id AE825C21D4A for ; Wed, 24 Jul 2019 14:39:39 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id 31so47329072wrm.1 for ; Wed, 24 Jul 2019 07:39:39 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=fpnN0uOMvR4DjRJfxVux4tdvICr5Rjygmvsk8TlIvnA=; b=MQVZ2YY2EKhWHLLaavQarKM51ls7jOHZ7N8mWZpNRCJNQtRJfYkVDlHw5vbIV2dFXF W6qAp6fnL+fb9/RHiw786uJCu/L1CZ95P9ksjyGYE62VQLWFE5OxDF2NGkoxZ0HGkqiw cMAcpX5+Zn+/ZA6Q7OGOz1dZqASEH8mWaPI5TS1afkxMn5E14RKVHN6//bkvXwIpXL7d 0M7zjoEQGuDlZK3PoRhxESbXrtznvm2PS2xiTdgtH5i9dJ24bbfjQulbBx9EMR++tB8O e+SLxw9eT3N8XZwF0YD4XJRcFc8kwyiwhKFU2tuNJTC7pIkBSOeLxUUyJGsypxREq54n 11GA== X-Gm-Message-State: APjAAAXU6kbWgi4nhW5lhQR6pbZIhBdAkcKNmC1i59gWXdb8lL6dbHqL Q2Ye3JGmLehlU2z4+7T/uXzHhO+V X-Google-Smtp-Source: APXvYqyYzkP4kraoV8icuHlxBOcusLrizbOSQSILHq90ieWqGbICGdj7ZQRO5lX7n4DS1rr/nKThUQ== X-Received: by 2002:adf:ea82:: with SMTP id s2mr82009745wrm.91.1563979179031; Wed, 24 Jul 2019 07:39:39 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id n14sm84860651wra.75.2019.07.24.07.39.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 24 Jul 2019 07:39:38 -0700 (PDT) From: Andrei Gherzan To: u-boot@lists.denx.de Date: Wed, 24 Jul 2019 15:39:09 +0100 Message-Id: <20190724143911.29770-7-andrei@balena.io> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724143911.29770-1-andrei@balena.io> References: <20190716133803.1174-1-andrei@gherzan.ro> <20190724143911.29770-1-andrei@balena.io> MIME-Version: 1.0 Cc: mbrugger@suse.com, Andrei Gherzan Subject: [U-Boot] [PATCH v2 6/8] mmc: bcm283x: Add support for bcm2711 device in bcm2835_sdhci X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Matthias Brugger The bcm2711 has two emmc controllers. The difference is the clocks they use. Add support for the second emmc controller. Signed-off-by: Matthias Brugger Signed-off-by: Andrei Gherzan --- drivers/mmc/bcm2835_sdhci.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c index 08bddd410e..e68dec3be7 100644 --- a/drivers/mmc/bcm2835_sdhci.c +++ b/drivers/mmc/bcm2835_sdhci.c @@ -178,12 +178,13 @@ static int bcm2835_sdhci_probe(struct udevice *dev) fdt_addr_t base; int emmc_freq; int ret; + int clock_id = (int)dev_get_driver_data(dev); base = devfdt_get_addr(dev); if (base == FDT_ADDR_T_NONE) return -EINVAL; - ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC); + ret = bcm2835_get_mmc_clock(clock_id); if (ret < 0) { debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret); return ret; @@ -228,7 +229,14 @@ static int bcm2835_sdhci_probe(struct udevice *dev) } static const struct udevice_id bcm2835_sdhci_match[] = { - { .compatible = "brcm,bcm2835-sdhci" }, + { + .compatible = "brcm,bcm2835-sdhci", + .data = BCM2835_MBOX_CLOCK_ID_EMMC + }, + { + .compatible = "brcm,bcm2711-emmc2", + .data = BCM2835_MBOX_CLOCK_ID_EMMC2 + }, { /* sentinel */ } };