From patchwork Tue Jul 16 13:37:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132778 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=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="g6Ac5Mg6"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1pr0VmVz9s7T for ; Tue, 16 Jul 2019 23:44:35 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A908CC21F1F; Tue, 16 Jul 2019 13:41:16 +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, T_DKIM_INVALID 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 E62B1C21E34; Tue, 16 Jul 2019 13:39:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4DA8EC21E34; Tue, 16 Jul 2019 13:38:16 +0000 (UTC) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by lists.denx.de (Postfix) with ESMTPS id E9D34C21E5B for ; Tue, 16 Jul 2019 13:38:15 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id u25so8382400wmc.4 for ; Tue, 16 Jul 2019 06:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jAiRv/c6MBJu4oLlfRe2SD3vcQoCepGe1nkkhOcQXaA=; b=g6Ac5Mg6LAwLzaGPUio4AGncQnMMtH+lQxglbrRBb2uiS2Z8YU7RfWfza8Y28geYyd YMB3bH0N2WfDlneGdiMxbxoZyAmV/UXIQGlC1j1wQNceAorIZHS/FN6ntbNyiKo7Mf47 pYq2RtZlmFNX2h4gB9qpSUtIvsB4ekQ3GDL24wljiC5Cpog+fqjzddI08fcEaHS4FMl+ T7BmwKD5TfUF9f3F0Zq0AvZX6m+SgXxhIpvMDBqRyGz+HoEfFRKSzaaolJGNHcLxxfYn 9sscnVYDC1DEgdMIoAverbdNZO4fJ+VRgc0LtEaDrLGGdk9O0o4FHzimyZRAlVpKryop Fs8A== 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=jAiRv/c6MBJu4oLlfRe2SD3vcQoCepGe1nkkhOcQXaA=; b=QhlKegp5MJpwVvHKLryfNTjldAXMEJOU8iDHTI29Jc4JRKJ+7t2Vdhsa/Ju2CRhPzA Wels1/GcNqI0Pq1+x14EheCms6MhZ31x9PpH/MDMZZcXQxBAHGCvLWyzVafR6Bwvtml+ 2CBapqQmyrdfl6Xl8fxtojl/QQXJC9uLv4OMur7B59xtW8LO07Yinu9XCNxeC0CuqJeg cctHgWXfLIPz1U9Lq/Bw1Sq+JqkkDfDzCPkirvgmGXJJfk7k4m8rs6sXwaT8iToBIYFv T+2bY3tx5iYXdlpmhRE4fk/Gwn6O9WHg7urC6ZoEVu9FQzdq050IuSCj0vT994l3dAAk GP+Q== X-Gm-Message-State: APjAAAUaUMHRPiV1ey9SgKD6MNXDtQ15gD606dqEdTHrEMUB8FGSDXHJ 8tTlMcK0zKX/nSjJIxoINuBRBRMa X-Google-Smtp-Source: APXvYqwI7kNjDT4+bKXM1qGQ6wtWlDJiZ2X1vy5/3Vvc09+fbsWdz2L6WYHLtt+x0BSkRz7Br55WJA== X-Received: by 2002:a1c:6504:: with SMTP id z4mr30054879wmb.172.1563284295230; Tue, 16 Jul 2019 06:38:15 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.14 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:14 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:55 +0100 Message-Id: <20190716133803.1174-9-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:53 +0000 Cc: Matthias Brugger Subject: [U-Boot] [PATCH 08/16] mmc: bcm2835_sdhci: Add support for bcm2711 device 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 controller. The difference is the clocks they use. Add support for the second emmc contoller. Signed-off-by: Matthias Brugger --- 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 */ } };