From patchwork Fri Nov 6 09:27:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1395570 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=ph1VWBMH; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CSFVj1k6rz9sSn for ; Fri, 6 Nov 2020 20:30:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2135682364; Fri, 6 Nov 2020 10:30:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="ph1VWBMH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C297D82259; Fri, 6 Nov 2020 10:30:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DFB9480404 for ; Fri, 6 Nov 2020 10:30:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=narmstrong@baylibre.com Received: by mail-wr1-x443.google.com with SMTP id n18so575288wrs.5 for ; Fri, 06 Nov 2020 01:30:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FjppC7PrkxvbDrQmO5gQPRV4XH6BwuKajbVUPyT2fYw=; b=ph1VWBMH5G/6jP+HXEJsiOOw+++F2MwoUspS8uj5Lcqgsfy9o9Yh+yBfWhxOl43/2c htDv67QA1HstUnd2/l/NfjpMtURHi4ayDMqAa4udnHBnZeKmfR2goe3isMuLSgfRq7hS xa1YKmKSpv/MSfwj/jIblXdZmDormOhfNoKb07f697OcfBBy8zqC+Y+DKWdY8gcjd2IR bIbuPNwcndNatpE0mX1bsWfcsA8zeg7cETLWPo10O92B4E4dw76nSQdZGMkBCQ6PvcYa rUVf1WppFRMxZq9GPtBrilULoX3Ixo9YMiHOKd8AzfifEJkzkS4ftGRhYQL5cAZ6Hhvh p+eg== 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=FjppC7PrkxvbDrQmO5gQPRV4XH6BwuKajbVUPyT2fYw=; b=Hjx0XnrqwDzzDeu/PfCJ0SzyYC40v1iuWBp3JXMakhZVmlvVWOZ1FXfqeJxXY4F2db HcdfK4eIsB1sVm+EtiVq70sri2ueh5qsN8K1bw+nfjCFSoiQKMVixeNreTHKOKLWvTkH 2aZx/ETMxA4o2ZvK0dC80U9eAKNfeJ5Arx54+nWHQ0JOcP6jRE5iNmZjbZGviI3gVRj/ Crbvo4+3Bo0FjbAH+kIu+fiPCMeh5awfyCSk023qAt0Y/SCUGFwjEsw+hsaWM6k718uq y8MHwAxoWQmlQRGuiNwOPYJWmUI3dl8KpZX/WhwoEmSyg2bw8LtO1AtSSsjOgWur+kJT fe7w== X-Gm-Message-State: AOAM531SNF+teZkVmgOsS5gK7uDYJV0MShDZFHZvKuWGd3A/+QceIDal 2h32CQ1I7+ygXGyLeduYVGM8VFuqnD5y+Ife6Po= X-Google-Smtp-Source: ABdhPJytKgo/xWD1pvGSrUNbpVyhGNICdrYqxAW7dUq4IwKvPaUfTJW/6NRATDh8b+vZ5Sp9JJqAFQ== X-Received: by 2002:adf:e28c:: with SMTP id v12mr1596525wri.230.1604655000908; Fri, 06 Nov 2020 01:30:00 -0800 (PST) Received: from localhost.localdomain (home.beaume.starnux.net. [82.236.8.43]) by smtp.gmail.com with ESMTPSA id a128sm1365176wmf.5.2020.11.06.01.29.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 01:29:59 -0800 (PST) From: Neil Armstrong To: u-boot@lists.denx.de Cc: u-boot-amlogic@groups.io, Neil Armstrong Subject: [PATCH 1/3] mmc: meson-gx: move arch header to local header Date: Fri, 6 Nov 2020 10:27:53 +0100 Message-Id: <20201106092755.2250773-2-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201106092755.2250773-1-narmstrong@baylibre.com> References: <20201106092755.2250773-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Move the asm/arch-meson/sd_emmc.h to a local meson_gx_mmc.h, remove the useless if/then and fix the meson_gx_mmc.c include. Signed-off-by: Neil Armstrong --- drivers/mmc/meson_gx_mmc.c | 4 ++-- .../asm/arch-meson/sd_emmc.h => drivers/mmc/meson_gx_mmc.h | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) rename arch/arm/include/asm/arch-meson/sd_emmc.h => drivers/mmc/meson_gx_mmc.h (97%) diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index 719dd1e5e5..9350edf3fa 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -13,9 +13,9 @@ #include #include #include -#include #include #include +#include "meson_gx_mmc.h" static inline void *get_regbase(const struct mmc *mmc) { @@ -265,7 +265,7 @@ static int meson_mmc_probe(struct udevice *dev) cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT | MMC_MODE_HS_52MHz | MMC_MODE_HS; cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV); - cfg->f_max = 100000000; /* 100 MHz */ + cfg->f_max = 100000000; /* 100 MHz */; cfg->b_max = 511; /* max 512 - 1 blocks */ cfg->name = dev->name; diff --git a/arch/arm/include/asm/arch-meson/sd_emmc.h b/drivers/mmc/meson_gx_mmc.h similarity index 97% rename from arch/arm/include/asm/arch-meson/sd_emmc.h rename to drivers/mmc/meson_gx_mmc.h index 1e9f8cf498..b4544b5562 100644 --- a/arch/arm/include/asm/arch-meson/sd_emmc.h +++ b/drivers/mmc/meson_gx_mmc.h @@ -3,14 +3,11 @@ * (C) Copyright 2016 Carlo Caione */ -#ifndef __SD_EMMC_H__ -#define __SD_EMMC_H__ +#ifndef __MESON_GX_MMC_H__ +#define __MESON_GX_MMC_H__ #include -#ifndef __ASSEMBLY__ #include -#endif - #define SDIO_PORT_A 0 #define SDIO_PORT_B 1 From patchwork Fri Nov 6 09:27:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1395569 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=S+Xz5PBC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CSFVT5WWkz9sSn for ; Fri, 6 Nov 2020 20:30:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 52FE582249; Fri, 6 Nov 2020 10:30:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="S+Xz5PBC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 329A382249; Fri, 6 Nov 2020 10:30:08 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1B96482249 for ; Fri, 6 Nov 2020 10:30:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=narmstrong@baylibre.com Received: by mail-wm1-x343.google.com with SMTP id c9so680604wml.5 for ; Fri, 06 Nov 2020 01:30:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t6lf+d6uFt5Cp26dATeppQeRxqpNUSXTpM90BKJ6/fs=; b=S+Xz5PBCOhYsOubhUTLNIN60gSoy8H3DAJWzuKKXZqNA9qMHZSkBPy7qTzHjFrWzMP vHz07zJmC0gQxo7rPveuTd7p2c2BRwAg/yNsCTHGDFSfcMPnPv0mRsjEL6qCK36/ebzb 6Of9+QOZmrumAlqJDzLUHYxDrF1t7LJDouzFt4/nHbTi8WSfvXsNkQ8ALT4P5W12YSNb +H6iVFyVG06HPnJ+kIo9kb3fShqVL3xpPqef0lrWofYtX/1KsyAzGKJA557VSSlH1hJv kVW/MbPbIFEApQvzTFNcBcgEU1q50z41tOK6EyCvhAtcmi8FxkpmvL0/NJm5j8mcf23j mL3A== 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=t6lf+d6uFt5Cp26dATeppQeRxqpNUSXTpM90BKJ6/fs=; b=S9dl7DZo2cxeaItkBheOIoTiETjveBJ+PkCjVLKJ2dVQ+28/0gqB/5+6Bh5cE5+qiY 2r6++UyxRyXztD7fwAFkMH4dnDGXlvFY//31UZN/P4vioaKZ+6er+wdp70N+OVzj4Tkh INg8Qx4VKuom4PsfDCo5fSGCZ3t1YRGJ70yU2hKohsFKXiEikGUeYe0cBsgmP4wDYKaC e+N/cX0rp9W/UvvgjA/zEZct3QWYxsJZDu/MuXyHEPqgaujbSOrKtvqzcbRYM08QRlGN fV8ZPU2M/5UQbUQ6po+mCsD/ixxctCQO63pfxnXWWWg1lQxn+U7U4QY8G6vgk/GS/2i/ x9Fw== X-Gm-Message-State: AOAM532menm1axsVP7EtR+oj/Az4WiYx4Il3Tvu2H2KvSk3RN0Pz1Tm4 SWo7VYayYKN8Qhi48iiDqa6YQxReQ7xVb0OCC1Y= X-Google-Smtp-Source: ABdhPJyjk+vjBxnJIgpxGlIFuh8kuDcsiSpr1QJNZEaOx2wZorrX4eeLSDbFz72JSQ9f1abMx43osw== X-Received: by 2002:a1c:87:: with SMTP id 129mr1453758wma.34.1604655002130; Fri, 06 Nov 2020 01:30:02 -0800 (PST) Received: from localhost.localdomain (home.beaume.starnux.net. [82.236.8.43]) by smtp.gmail.com with ESMTPSA id a128sm1365176wmf.5.2020.11.06.01.30.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 01:30:01 -0800 (PST) From: Neil Armstrong To: u-boot@lists.denx.de Cc: u-boot-amlogic@groups.io, Neil Armstrong Subject: [PATCH 2/3] mmc: meson-gx: limit max frequency on SM1 SoCs Date: Fri, 6 Nov 2020 10:27:54 +0100 Message-Id: <20201106092755.2250773-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201106092755.2250773-1-narmstrong@baylibre.com> References: <20201106092755.2250773-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Amlogic SM1 SoCs doesn't handle very well high clocks from the DIV2 input Thus we limit the max freq to 26MHz on SM1 SoCs until we handle higher frequencies via the first input from a composite clock. Here 26MHz corresponds to MMC_HS clock speed. We also add a u-boot only sm1 compatible to distinguish the controller. Finally a TOFIX is added to precise the clock management should use the clock controller instead of local management with fixed clock rates. Signed-off-by: Neil Armstrong --- drivers/mmc/meson_gx_mmc.c | 26 +++++++++++++++++++++++--- drivers/mmc/meson_gx_mmc.h | 5 +++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index 9350edf3fa..2c6b6cd15b 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -17,6 +17,14 @@ #include #include "meson_gx_mmc.h" +bool meson_gx_mmc_is_compatible(struct udevice *dev, + enum meson_gx_mmc_compatible family) +{ + enum meson_gx_mmc_compatible compat = dev_get_driver_data(dev); + + return compat == family; +} + static inline void *get_regbase(const struct mmc *mmc) { struct meson_mmc_platdata *pdata = mmc->priv; @@ -42,6 +50,8 @@ static void meson_mmc_config_clock(struct mmc *mmc) if (!mmc->clock) return; + /* TOFIX This should use the proper clock taken from DT */ + /* 1GHz / CLK_MAX_DIV = 15,9 MHz */ if (mmc->clock > 16000000) { clk = SD_EMMC_CLKSRC_DIV2; @@ -265,7 +275,16 @@ static int meson_mmc_probe(struct udevice *dev) cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT | MMC_MODE_HS_52MHz | MMC_MODE_HS; cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV); - cfg->f_max = 100000000; /* 100 MHz */; + /* + * TOFIX SM1 SoCs doesn't handle very well high clocks from the DIV2 input + * Thus we limit the max freq to 26MHz on SM1 SoCs until we handle higher + * frequencies via the first input from a composite clock + * 26MHz corresponds to MMC_HS clock speed + */ + if (meson_gx_mmc_is_compatible(dev, MMC_COMPATIBLE_SM1)) + cfg->f_max = 26000000; /* 26 MHz */ + else + cfg->f_max = 100000000; /* 100 MHz */ cfg->b_max = 511; /* max 512 - 1 blocks */ cfg->name = dev->name; @@ -308,8 +327,9 @@ int meson_mmc_bind(struct udevice *dev) } static const struct udevice_id meson_mmc_match[] = { - { .compatible = "amlogic,meson-gx-mmc" }, - { .compatible = "amlogic,meson-axg-mmc" }, + { .compatible = "amlogic,meson-gx-mmc", .data = MMC_COMPATIBLE_GX }, + { .compatible = "amlogic,meson-axg-mmc", .data = MMC_COMPATIBLE_GX }, + { .compatible = "amlogic,meson-sm1-mmc", .data = MMC_COMPATIBLE_SM1 }, { /* sentinel */ } }; diff --git a/drivers/mmc/meson_gx_mmc.h b/drivers/mmc/meson_gx_mmc.h index b4544b5562..92aec5329f 100644 --- a/drivers/mmc/meson_gx_mmc.h +++ b/drivers/mmc/meson_gx_mmc.h @@ -9,6 +9,11 @@ #include #include +enum meson_gx_mmc_compatible { + MMC_COMPATIBLE_GX, + MMC_COMPATIBLE_SM1, +}; + #define SDIO_PORT_A 0 #define SDIO_PORT_B 1 #define SDIO_PORT_C 2 From patchwork Fri Nov 6 09:27:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1395571 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=tAymI5pn; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CSFVw3JCNz9sSn for ; Fri, 6 Nov 2020 20:30:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AF0408239C; Fri, 6 Nov 2020 10:30:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="tAymI5pn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2829382249; Fri, 6 Nov 2020 10:30:09 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6AD8F801D8 for ; Fri, 6 Nov 2020 10:30:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=narmstrong@baylibre.com Received: by mail-wm1-x330.google.com with SMTP id d142so681827wmd.4 for ; Fri, 06 Nov 2020 01:30:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aZXxXKv1o/OXMBOlAPV0583wkUDZ+PKP+fWiGr0q5fs=; b=tAymI5pnbnQ/a3MqHkrzwm2ylcp/dxTlU9wiRZKVPVDXX5R5xY2l/ThhvzuvoHZGQn B5uRWiWSHh3gCO05wyZwvMjxIglke0aHY8NEqTDNdFuOVdvwRjzSEsZLJ2Dzkpq+SqJr Rt8u0vCPaPaA31Rd8y6NhxcUpC7iQGZrIt5I/D8J31hhJ1w/04z8T+j/U1/DAPduWrFK 6FxxFHo0DoQlrw/Ayfu/QTMZqgNXs808W6iCI8aRigsoOcP04LkBB9iha5wUvIrNHQa3 ZYxmTD6cg1nKTWMbx/D77HAX0tMcx/6QWIx+o0jpqQqrUEaO0WsGEO52mVXl6h5cVofY oHRA== 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=aZXxXKv1o/OXMBOlAPV0583wkUDZ+PKP+fWiGr0q5fs=; b=bvPljcEZGBB7RPYoRW1gu5XskMSfJOcGMPFv9FexaQM+sqDxwwmxtYtgLNIT8GO6nx uI4TkiOOzP4IopLbV6dI0zXpDL7wuHV9bRCWK6RkoIDNyTnsD9vnwTXD31Qoo9tKMwCC w1YyYaGpH/Dn/2ryHKVobQGJo2HkpxY4AI5MF+QCvj+vdN/TvVumluDYaOJpnQeIE27k P59kk32nauWtIXgVSMzNEH0OOJSII2ChjEEobdX/a4ScZ8UKUyd+O8K9jXuQk7Mu0gvR Po05TWhdGRdD3HSUGyWZ5nAdk8j+LSPOl2k/oZpe9zqYvL7u+GrrgabLNy2ij2V7i7J2 s3/Q== X-Gm-Message-State: AOAM530XMnhuPLYkPCaxMYHqGNrYqkeNFc7CP4OYwdn1MajhRRKR/By9 OBBJuMvQQv0W7ko5wpm/k4xAoKVAl/aAtLw37xU= X-Google-Smtp-Source: ABdhPJwAlGYzH2YDkMnMJSnaFmbnCkbvHJAW997+t7GzB1SPlIAS6OTOCAF5uuvbod04gRIHCd/sqg== X-Received: by 2002:a7b:cb09:: with SMTP id u9mr1399185wmj.49.1604655003467; Fri, 06 Nov 2020 01:30:03 -0800 (PST) Received: from localhost.localdomain (home.beaume.starnux.net. [82.236.8.43]) by smtp.gmail.com with ESMTPSA id a128sm1365176wmf.5.2020.11.06.01.30.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 01:30:02 -0800 (PST) From: Neil Armstrong To: u-boot@lists.denx.de Cc: u-boot-amlogic@groups.io, Neil Armstrong Subject: [PATCH 3/3] ARM: dts: meson-sm1: add u-boot specific MMC controller compatible Date: Fri, 6 Nov 2020 10:27:55 +0100 Message-Id: <20201106092755.2250773-4-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201106092755.2250773-1-narmstrong@baylibre.com> References: <20201106092755.2250773-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean In order to enable the Amlogic SM1 MMC controller fix, we need to add a u-boot specific MMC controller compatible. This adds a new meson-sm1-u-boot.dtsi and reworks the other -u-boot.dtsi to use this for SM1 based boards. Signed-off-by: Neil Armstrong --- .../meson-g12b-a311d-khadas-vim3-u-boot.dtsi | 1 + arch/arm/dts/meson-khadas-vim3-u-boot.dtsi | 2 -- .../dts/meson-sm1-khadas-vim3l-u-boot.dtsi | 1 + arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi | 2 +- arch/arm/dts/meson-sm1-sei610-u-boot.dtsi | 2 +- arch/arm/dts/meson-sm1-u-boot.dtsi | 20 +++++++++++++++++++ 6 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/meson-sm1-u-boot.dtsi diff --git a/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi b/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi index f66eca14b1..489efa150a 100644 --- a/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi @@ -4,4 +4,5 @@ * Author: Neil Armstrong */ +#include "meson-g12-common-u-boot.dtsi" #include "meson-khadas-vim3-u-boot.dtsi" diff --git a/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi b/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi index b5da4fdfc3..81fd5be378 100644 --- a/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi +++ b/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi @@ -4,8 +4,6 @@ * Author: Neil Armstrong */ -#include "meson-g12-common-u-boot.dtsi" - / { aliases { spi0 = &spifc; diff --git a/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi b/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi index f66eca14b1..a591c0c9f2 100644 --- a/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi @@ -4,4 +4,5 @@ * Author: Neil Armstrong */ +#include "meson-sm1-u-boot.dtsi" #include "meson-khadas-vim3-u-boot.dtsi" diff --git a/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi b/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi index 2a8f0545b1..c431988075 100644 --- a/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi @@ -4,7 +4,7 @@ * Author: Neil Armstrong */ -#include "meson-g12-common-u-boot.dtsi" +#include "meson-sm1-u-boot.dtsi" ðmac { snps,reset-gpio = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; diff --git a/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi b/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi index 236f2468dc..8ebc1caa4a 100644 --- a/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi @@ -4,4 +4,4 @@ * Author: Neil Armstrong */ -#include "meson-g12-common-u-boot.dtsi" +#include "meson-sm1-u-boot.dtsi" diff --git a/arch/arm/dts/meson-sm1-u-boot.dtsi b/arch/arm/dts/meson-sm1-u-boot.dtsi new file mode 100644 index 0000000000..e05d4c369a --- /dev/null +++ b/arch/arm/dts/meson-sm1-u-boot.dtsi @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2020 BayLibre, SAS. + * Author: Neil Armstrong + */ + +#include "meson-g12-common-u-boot.dtsi" + +&sd_emmc_a { + compatible = "amlogic,meson-sm1-mmc"; +}; + +&sd_emmc_b { + compatible = "amlogic,meson-sm1-mmc"; +}; + +&sd_emmc_c { + compatible = "amlogic,meson-sm1-mmc"; +}; +