From patchwork Fri Jan 11 18:04:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1023711 X-Patchwork-Delegate: jagannadh.teki@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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="le6Bd2Hz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43brQT2hybz9sDL for ; Sat, 12 Jan 2019 05:06:09 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E3957C221E4; Fri, 11 Jan 2019 18:04:56 +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_H3, RCVD_IN_MSPIKE_WL, 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 4859EC22226; Fri, 11 Jan 2019 18:04:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 72511C221E4; Fri, 11 Jan 2019 18:04:44 +0000 (UTC) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by lists.denx.de (Postfix) with ESMTPS id 83019C221F7 for ; Fri, 11 Jan 2019 18:04:40 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id u6so7079110plm.8 for ; Fri, 11 Jan 2019 10:04:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3KOGznCeA7Z45cSyspnsCkaV47Q9GcK4w8b4nn/JrW8=; b=le6Bd2Hzsphm6Vae379+u68IvoX1CJ8ihTBFOtAPwqCU4QD8ggbURqHGT8x+edMhx6 bPhXZZh6cUFi+G/rvhD+e9Uj21+/EfdOsMmBfvMM66Ufy33/E8dHKrT+nSlTrEgZqrOF xMFPhSawgyoz04JTsnXP48BzU5HvcMg3w7T5Y= 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=3KOGznCeA7Z45cSyspnsCkaV47Q9GcK4w8b4nn/JrW8=; b=XJZvqHfYfDL7+yCVYIOw1FSX+TMcy7/HdIFQ0CSaZM/ZELqO2ZUktETBe7pKBJVchu rJf2linX5F6yfiuetmoFmxHEP/GIIOYpSsLohv46k+5nXSq49mYIbyU9oUcbmOUZwHmb iJJIIjQTNx1nJxhsxnvKnoAp7tI7R/r9vdu7xiBrVSVy4nLVP6NLk1Dnc9MCBS/ucOeo xCYPIvzaEQqO0AoNNDfkFUll564b+aFAy9OGdHZmo6IDDpmpoWLPU/bEL/5ndgoAz5k4 RKgt/DI4UrTDrsmILdW1qgiX29xcALwZ0MI2vz+IrwxlrfYPq8g4bexwo4KqtoIw9Tpu k5LQ== X-Gm-Message-State: AJcUukfLB8y4WjoIamNo7nu0XGjqdoVmYSozE3dF9R1W8XiHbxym02cf Wk05IF+kFPwr6QZCW0kl4XPNzA== X-Google-Smtp-Source: ALg8bN4v/VSZ4Ta5j/W2Owf6KqEttJfM4suRUoI/JpdNPRWVP9uFmFrQcdfju9A5glTsMOwdbK+4/A== X-Received: by 2002:a17:902:161:: with SMTP id 88mr15952153plb.306.1547229878937; Fri, 11 Jan 2019 10:04:38 -0800 (PST) Received: from localhost.localdomain ([49.206.202.55]) by smtp.gmail.com with ESMTPSA id 186sm156638146pga.36.2019.01.11.10.04.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 10:04:37 -0800 (PST) From: Jagan Teki To: Maxime Ripard , Andre Przywara , Chen-Yu Tsai , Simon Glass , Tom Rini , u-boot@lists.denx.de, linux-sunxi@googlegroups.com, Priit Laes , linux-amarula@amarulasolutions.com Date: Fri, 11 Jan 2019 23:34:08 +0530 Message-Id: <20190111180414.1563-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190111180414.1563-1-jagan@amarulasolutions.com> References: <20190111180414.1563-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 1/7] mmc: sunxi: Configure reset support for DM_MMC 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" Start with Allwinner A31, mmc controllers do support reset control bit. This code add support to enable the reset control start from SUN6I even though it share same compatible between SUN4I and SUN6I. Signed-off-by: Jagan Teki --- drivers/mmc/sunxi_mmc.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 302332bf97..0b17e2c391 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -21,8 +21,11 @@ #ifdef CONFIG_DM_MMC struct sunxi_mmc_variant { + bool has_reset; u16 gate_offset; u16 mclk_offset; + u16 reset_offset; + u8 reset_start_bit; }; #endif @@ -609,7 +612,7 @@ static int sunxi_mmc_probe(struct udevice *dev) struct sunxi_mmc_priv *priv = dev_get_priv(dev); struct mmc_config *cfg = &plat->cfg; struct ofnode_phandle_args args; - u32 *gate_reg, *ccu_reg; + u32 *gate_reg, *reset_reg, *ccu_reg; int bus_width, ret; cfg->name = dev->name; @@ -644,6 +647,12 @@ static int sunxi_mmc_probe(struct udevice *dev) gate_reg = (void *)ccu_reg + priv->variant->gate_offset; setbits_le32(gate_reg, BIT(AHB_GATE_OFFSET_MMC(priv->mmc_no))); + if ((!IS_ENABLED(CONFIG_MACH_SUN4I)) && priv->variant->has_reset) { + reset_reg = (void *)ccu_reg + priv->variant->reset_offset; + setbits_le32(reset_reg, BIT(priv->mmc_no + + priv->variant->reset_start_bit)); + } + ret = mmc_set_mod_clk(priv, 24000000); if (ret) return ret; @@ -680,6 +689,14 @@ static const struct sunxi_mmc_variant sun4i_a10_variant = { .mclk_offset = 0x88, }; +static const struct sunxi_mmc_variant sun7i_a20_variant = { + .has_reset = true, + .gate_offset = 0x60, + .mclk_offset = 0x88, + .reset_offset = 0x2c0, + .reset_start_bit = 8, +}; + static const struct udevice_id sunxi_mmc_ids[] = { { .compatible = "allwinner,sun4i-a10-mmc", @@ -691,7 +708,7 @@ static const struct udevice_id sunxi_mmc_ids[] = { }, { .compatible = "allwinner,sun7i-a20-mmc", - .data = (ulong)&sun4i_a10_variant, + .data = (ulong)&sun7i_a20_variant, }, { /* sentinel */ } }; From patchwork Fri Jan 11 18:04:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1023713 X-Patchwork-Delegate: jagannadh.teki@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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="naxaUK2p"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43brRP6s6Pz9sDL for ; Sat, 12 Jan 2019 05:06:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 96C75C221ED; Fri, 11 Jan 2019 18:05:32 +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_H3, RCVD_IN_MSPIKE_WL, 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 1E5FEC221C3; Fri, 11 Jan 2019 18:05:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 43D90C221F4; Fri, 11 Jan 2019 18:04:47 +0000 (UTC) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by lists.denx.de (Postfix) with ESMTPS id B3F80C22201 for ; Fri, 11 Jan 2019 18:04:43 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id 64so7284953pfr.9 for ; Fri, 11 Jan 2019 10:04:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ij4FUc1rSEfp+2sbS+ouy1eCo/4qyzl44oHn3TEg2Vg=; b=naxaUK2pfg1ziQdl5N28NH4Lzm7KjyvvsFyqTkL/N74BKw87Y9Up2Z7k22RWsFy+4L 8vgyr5S2Y+p2oCDsmJEHxPOEbNMjPNb7t6Wigsx51iBySpzS7VxjZp+jNHoMCSo5Sa8C S64bz0eqCvHSLfcr5lB27Dnmfx1uwFIxpU2H8= 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=Ij4FUc1rSEfp+2sbS+ouy1eCo/4qyzl44oHn3TEg2Vg=; b=aFAEY+fm6T5fjOEccb2W3g0A4Qgz86dOJwd91BwYQnQYAJE+iXtp0VqnpDBR8pTtxi 2dNFTp8uRXGwTKBrDUsPcvYb0ib1G2q3IpyfYN1kVaGkWLa+hjHPNC0nHoXdSByLbvlg EQLp3yIJFskXQbAQKG2zXKT208Mr9TOyBz2hatpliIqWSPRpAn28biDAse8mTxBeCBcJ wKsGuRpF0FlbCJEDVo4go38n0n0nnPuboC4Nwr0RVnzhjlk4Hv6ORQLc03IAgz3KC1Bb 6vm8u+rjJ6Vvr7QA3zwGfyZ8RssF8+WzNME5p3Ol34l7jxm7qh14uiBFYG3kBTVP34Jn hSOg== X-Gm-Message-State: AJcUuke6xbDa2jYmy62ezy+H9Th7L7bk/PRrquU6+pUk3V8gVVITd9sy iamCEoul7YoxCZhvQ5c4SiY93oh6VRM= X-Google-Smtp-Source: ALg8bN725noiG4aqfBJxtYXl9XaZXls7bAXLGEKDKiJdZ+Is/dJUDEke5xupYv1khteUjaP/UTwHEQ== X-Received: by 2002:a62:f5da:: with SMTP id b87mr15712455pfm.253.1547229882347; Fri, 11 Jan 2019 10:04:42 -0800 (PST) Received: from localhost.localdomain ([49.206.202.55]) by smtp.gmail.com with ESMTPSA id 186sm156638146pga.36.2019.01.11.10.04.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 10:04:41 -0800 (PST) From: Jagan Teki To: Maxime Ripard , Andre Przywara , Chen-Yu Tsai , Simon Glass , Tom Rini , u-boot@lists.denx.de, linux-sunxi@googlegroups.com, Priit Laes , linux-amarula@amarulasolutions.com Date: Fri, 11 Jan 2019 23:34:09 +0530 Message-Id: <20190111180414.1563-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190111180414.1563-1-jagan@amarulasolutions.com> References: <20190111180414.1563-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 2/7] mmc: sunxi: Add A83T emmc compatible 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" Add emmc compatible for A83T SoC. Signed-off-by: Jagan Teki --- drivers/mmc/sunxi_mmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 0b17e2c391..5557111c1f 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -710,6 +710,10 @@ static const struct udevice_id sunxi_mmc_ids[] = { .compatible = "allwinner,sun7i-a20-mmc", .data = (ulong)&sun7i_a20_variant, }, + { + .compatible = "allwinner,sun8i-a83t-emmc", + .data = (ulong)&sun7i_a20_variant, + }, { /* sentinel */ } }; From patchwork Fri Jan 11 18:04:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1023716 X-Patchwork-Delegate: jagannadh.teki@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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="bmDGXodx"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43brS35Jsyz9sCr for ; Sat, 12 Jan 2019 05:07:31 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 76B2AC22202; Fri, 11 Jan 2019 18:05:50 +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_H3, RCVD_IN_MSPIKE_WL, 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 28117C22227; Fri, 11 Jan 2019 18:05:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7EB70C22180; Fri, 11 Jan 2019 18:04:50 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by lists.denx.de (Postfix) with ESMTPS id 60FDDC22225 for ; Fri, 11 Jan 2019 18:04:47 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id a14so7074100plm.12 for ; Fri, 11 Jan 2019 10:04:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B1TrSTnhRMKrzJmBd0hPwqL83gzWQxNaik/ACas5fPI=; b=bmDGXodxvUsbtKBjXtg8v42EmYXPiX3zXMAK4KYw1GcfKo8MJ6zpkIYpD2cm3r2Zl2 YnkSDPdNw1aZovKBHpq5JCk2i7RNuHl4Bh7JVLsCns92Yjw/ZTyEFSIMVAoEfrY2CRcg Urm5unnwVuHW9FDqbJWkr3mYnUnIKRft5Cbn0= 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=B1TrSTnhRMKrzJmBd0hPwqL83gzWQxNaik/ACas5fPI=; b=nKHp9B7HtVhtKPYgQrljAr23I6QXk5iYoRXTr8mJHz7jqdfLpIPoWvtxQ4ywP1k0FY 69w231cLAZkqqZ/ncW0urGCILv//BKsbDp7eqJYn36C7VI+V8INzK2du3Bxg/IQeBZBB dxREivS5p6N35p/64/5FtyOaR4FNdq3eMOnXLWh4z/NnDwerf7i1b6XWRg0GT35nTCmA 8sUi1EqktWhOAi3ahcToshvkZa+teRZEYMGkZ1MHZUqU4T5/GC2exIMfhcvE0dhD4kNy xswSBJGjg/f3b7bP+o6e+90UtsIdWq5wk2vqKrKz8CFNIeJG79xa/c7GQAe0vsfPhM/U STYQ== X-Gm-Message-State: AJcUukfPOgKzs/zI9iSS19UuaydFJwPiiiV8oC+FDkl903+XNRLFqFpq iy9+lCoOu+bB+jLiu8omAmrLU9zQlE0= X-Google-Smtp-Source: ALg8bN6hLQssmQIJH0Y1Cb+Qnz7D/deFUQqMTWx8I0dl3W2LljzcjxQkaUZafJSoSGYvdwMOvOJgtw== X-Received: by 2002:a17:902:934a:: with SMTP id g10mr9474893plp.172.1547229886001; Fri, 11 Jan 2019 10:04:46 -0800 (PST) Received: from localhost.localdomain ([49.206.202.55]) by smtp.gmail.com with ESMTPSA id 186sm156638146pga.36.2019.01.11.10.04.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 10:04:45 -0800 (PST) From: Jagan Teki To: Maxime Ripard , Andre Przywara , Chen-Yu Tsai , Simon Glass , Tom Rini , u-boot@lists.denx.de, linux-sunxi@googlegroups.com, Priit Laes , linux-amarula@amarulasolutions.com Date: Fri, 11 Jan 2019 23:34:10 +0530 Message-Id: <20190111180414.1563-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190111180414.1563-1-jagan@amarulasolutions.com> References: <20190111180414.1563-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 3/7] mmc: sunxi: Add mmc, emmc H5/A64 compatible 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" Added H5, A64 compatible for mmc and emmc. Signed-off-by: Jagan Teki --- drivers/mmc/sunxi_mmc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 5557111c1f..b50d70645a 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -714,6 +714,14 @@ static const struct udevice_id sunxi_mmc_ids[] = { .compatible = "allwinner,sun8i-a83t-emmc", .data = (ulong)&sun7i_a20_variant, }, + { + .compatible = "allwinner,sun50i-a64-mmc", + .data = (ulong)&sun7i_a20_variant, + }, + { + .compatible = "allwinner,sun50i-a64-emmc", + .data = (ulong)&sun7i_a20_variant, + }, { /* sentinel */ } }; From patchwork Fri Jan 11 18:04:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1023712 X-Patchwork-Delegate: jagannadh.teki@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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="DAbGB/wY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43brQZ1v3bz9sDX for ; Sat, 12 Jan 2019 05:06:14 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DC292C22218; Fri, 11 Jan 2019 18:05:15 +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_H3, RCVD_IN_MSPIKE_WL, 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 24E52C221C6; Fri, 11 Jan 2019 18:04:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6A6A2C22220; Fri, 11 Jan 2019 18:04:53 +0000 (UTC) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by lists.denx.de (Postfix) with ESMTPS id BFD93C221DE for ; Fri, 11 Jan 2019 18:04:50 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id b5so7089629plr.4 for ; Fri, 11 Jan 2019 10:04:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iRQDnlE+DNrIm/2YUMYPMORIBnw8OEEYi6L8wTPdl28=; b=DAbGB/wYfcSFhbpIcOoUtPrQ2trCQAbcCm8pxPVHM0gIWwSjm0bMqU2Jw2ek1ogYEt mjb5j+pHl6Ev91qEsMmornbnyJu9efvgc8zE1ZJM3P9SzAAMiXRhvW3dBPndmi8RtJcy cMehXckDnKgXTjDPsvsKt5kRmRK/krP+1leqU= 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=iRQDnlE+DNrIm/2YUMYPMORIBnw8OEEYi6L8wTPdl28=; b=WCFqXip3sUp4rrozNg0LY9AyjQify8IODocGwOapHT4MCeANoSAjr7covm8dsRb2bY JxenFItD4TKSdhOUKiChCUtbvfTHOTRcnKx7RT59RVmXotKafNvJ3D3+r7g8Lgenubx7 b7Q9pxuN1j5sz8qrpbo9s+q1p9EiDGvXX925IQOsbD+FWekbBgEMCu6r5XqGa9L3d1WH 3jBd2UnWNnEfurefMmRTZPiuQaTDQI4thMJPyH0StuW23SYIdcofthF2tN9aCOoDXg+v aGH33taFjmbsEQMkt9e3Xx5aPzMyq06nThKF0bq9NNNcJcr0a+21NoYpctvaYm0a/Zyz 63Fg== X-Gm-Message-State: AJcUukfxTF6Zr0iLTb3Il/NiIkgxtyDtza7y/AYnHODHfipvvYRqtkq3 UWr2W+3b9L6lkGzPaqQ0eCYhng== X-Google-Smtp-Source: ALg8bN5ufi8HDP0F/fE7Loy9m5ICx5U5l2LjRR9PAfY5LnJWUmnd4AHsA4OhhvKzduKYnMsztIrVmw== X-Received: by 2002:a17:902:a6:: with SMTP id a35mr15666086pla.201.1547229889400; Fri, 11 Jan 2019 10:04:49 -0800 (PST) Received: from localhost.localdomain ([49.206.202.55]) by smtp.gmail.com with ESMTPSA id 186sm156638146pga.36.2019.01.11.10.04.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 10:04:48 -0800 (PST) From: Jagan Teki To: Maxime Ripard , Andre Przywara , Chen-Yu Tsai , Simon Glass , Tom Rini , u-boot@lists.denx.de, linux-sunxi@googlegroups.com, Priit Laes , linux-amarula@amarulasolutions.com Date: Fri, 11 Jan 2019 23:34:11 +0530 Message-Id: <20190111180414.1563-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190111180414.1563-1-jagan@amarulasolutions.com> References: <20190111180414.1563-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 4/7] mmc: sunxi: Add DM_MMC support for H6 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" Unlike other Allwinner SoC's, H6 comes with different clock and reset control offset values. So support them via driver data. Signed-off-by: Jagan Teki --- .../arm/include/asm/arch-sunxi/clock_sun50i_h6.h | 3 +++ drivers/mmc/sunxi_mmc.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h index e36937059b..baf9b2e6e2 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h @@ -301,6 +301,9 @@ struct sunxi_ccm_reg { #define DRAM_CLK_SRC_PLL5 (0 << 24) #define DRAM_CLK_M(m) (((m)-1) << 0) +/* MMC ahb clock bit field */ +#define AHB_GATE_OFFSET_MMC(n) ((n)) + /* MMC clock bit field */ #define CCM_MMC_CTRL_M(x) ((x) - 1) #define CCM_MMC_CTRL_N(x) ((x) << 8) diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index b50d70645a..05f15838a8 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -697,6 +697,14 @@ static const struct sunxi_mmc_variant sun7i_a20_variant = { .reset_start_bit = 8, }; +static const struct sunxi_mmc_variant sun50i_h6_variant = { + .has_reset = true, + .gate_offset = 0x84c, + .mclk_offset = 0x830, + .reset_offset = 0x84c, + .reset_start_bit = 16, +}; + static const struct udevice_id sunxi_mmc_ids[] = { { .compatible = "allwinner,sun4i-a10-mmc", @@ -722,6 +730,14 @@ static const struct udevice_id sunxi_mmc_ids[] = { .compatible = "allwinner,sun50i-a64-emmc", .data = (ulong)&sun7i_a20_variant, }, + { + .compatible = "allwinner,sun50i-h6-mmc", + .data = (ulong)&sun50i_h6_variant, + }, + { + .compatible = "allwinner,sun50i-h6-emmc", + .data = (ulong)&sun50i_h6_variant, + }, { /* sentinel */ } }; From patchwork Fri Jan 11 18:04:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1023722 X-Patchwork-Delegate: jagannadh.teki@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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="mqkma8eP"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43brVQ3MVJz9s9h for ; Sat, 12 Jan 2019 05:09:34 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 21880C2221F; Fri, 11 Jan 2019 18:06:27 +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_H3, RCVD_IN_MSPIKE_WL, 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 B702AC221DF; Fri, 11 Jan 2019 18:05:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6E844C22182; Fri, 11 Jan 2019 18:04:58 +0000 (UTC) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by lists.denx.de (Postfix) with ESMTPS id 9CB34C22201 for ; Fri, 11 Jan 2019 18:04:54 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id g62so7277577pfd.12 for ; Fri, 11 Jan 2019 10:04:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MLVfoDf3+d8p1+iYTCUdtCzuI/b7rgrgA1boQxKy7Uk=; b=mqkma8ePv7HqHol17uPwgSOqg2XF37nwvZ3z34BkuZ3UHyZSpKB5XwBqZKA9waIfhE hitnpi/Vb2jV2iVSMFmnN6oo8cX13eS0Mntcc6QM9l2cs4XzSKGG3JBvzA7TdjeeeGMy 62RXL3bjEAevUyWC3IrODRVppQbTQtUcnyI6I= 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=MLVfoDf3+d8p1+iYTCUdtCzuI/b7rgrgA1boQxKy7Uk=; b=inyJ4kMYLQoIPYsXDNpKPj3imRn5FaQjB2fOnK5PVakLhn6SkB1UadLbW5415RA2fl zYjiNCL7+g7sFuDO7ptuR2GNPI/e2++GNfr+TIaetns7g9On+ww2jOyntH/WbTjmZbAJ UPMdO3iQgg353dPWuhQ/QZoBBF6O5GWrGz7we1V728twpOPZeMwO0zroU53ZmC9BPX+X pcjF0EeQLO8ngI+9EjTnGzFeyXalaxjDMvM15MY67gEtZQxLtxDKiIngpgsLV/sX884t Q7z/81YLTToy+YO65Bt+Sw6wmYszCY9pP59QuYfR1tjZp6KW7xIwt0rtQB1wVExZWx7F Heew== X-Gm-Message-State: AJcUukf7jQsse/Xpzz/P0y52eRTK4MCGra0JNA7fc2t4MesqUzU0oMc6 rbMbqtFi4AAbnVhkW2edmU+vFQ== X-Google-Smtp-Source: ALg8bN5r5IzK4x00UX2yq0OFeRekySJV9h9CjPSCH6s1BwuG1cnsCjAHRYSnXF6z/JaEbmag+ii/Vg== X-Received: by 2002:a63:2315:: with SMTP id j21mr14397221pgj.297.1547229893234; Fri, 11 Jan 2019 10:04:53 -0800 (PST) Received: from localhost.localdomain ([49.206.202.55]) by smtp.gmail.com with ESMTPSA id 186sm156638146pga.36.2019.01.11.10.04.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 10:04:52 -0800 (PST) From: Jagan Teki To: Maxime Ripard , Andre Przywara , Chen-Yu Tsai , Simon Glass , Tom Rini , u-boot@lists.denx.de, linux-sunxi@googlegroups.com, Priit Laes , linux-amarula@amarulasolutions.com Date: Fri, 11 Jan 2019 23:34:12 +0530 Message-Id: <20190111180414.1563-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190111180414.1563-1-jagan@amarulasolutions.com> References: <20190111180414.1563-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: Rask Ingemann Lambertsen Subject: [U-Boot] [PATCH 5/7] mmc: sunxi: Add DM_MMC support for A80 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" Unlike other Allwinner SoC's, A80 comes with different ahb gate clock offset values and also has mmc common controller. So support them via driver data. Cc: Rask Ingemann Lambertsen Signed-off-by: Jagan Teki --- drivers/mmc/sunxi_mmc.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 05f15838a8..33f1ec5e5a 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -22,6 +22,7 @@ #ifdef CONFIG_DM_MMC struct sunxi_mmc_variant { bool has_reset; + bool has_mmc_common; u16 gate_offset; u16 mclk_offset; u16 reset_offset; @@ -653,6 +654,19 @@ static int sunxi_mmc_probe(struct udevice *dev) priv->variant->reset_start_bit)); } + if (priv->variant->has_mmc_common) { + u32 *mmc_config_clk, *mmc_common_base; + + ret = dev_read_phandle_with_args(dev, "clocks", "#clock-cells", 0, + 0, &args); + if (ret) + return ret; + mmc_config_clk = (u32 *)ofnode_get_addr(args.node); + + mmc_common_base = (void *)mmc_config_clk + (priv->mmc_no * 4); + setbits_le32(mmc_common_base, BIT(18) | BIT(16)); + } + ret = mmc_set_mod_clk(priv, 24000000); if (ret) return ret; @@ -697,6 +711,12 @@ static const struct sunxi_mmc_variant sun7i_a20_variant = { .reset_start_bit = 8, }; +static const struct sunxi_mmc_variant sun9i_a80_variant = { + .has_mmc_common = true, + .gate_offset = 0x580, + .mclk_offset = 0x410, +}; + static const struct sunxi_mmc_variant sun50i_h6_variant = { .has_reset = true, .gate_offset = 0x84c, @@ -722,6 +742,10 @@ static const struct udevice_id sunxi_mmc_ids[] = { .compatible = "allwinner,sun8i-a83t-emmc", .data = (ulong)&sun7i_a20_variant, }, + { + .compatible = "allwinner,sun9i-a80-mmc", + .data = (ulong)&sun9i_a80_variant, + }, { .compatible = "allwinner,sun50i-a64-mmc", .data = (ulong)&sun7i_a20_variant, From patchwork Fri Jan 11 18:04:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1023719 X-Patchwork-Delegate: jagannadh.teki@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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="o/hhJLaa"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43brT35GSZz9s9h for ; Sat, 12 Jan 2019 05:08:23 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 758AFC22182; Fri, 11 Jan 2019 18:06:09 +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_H3, RCVD_IN_MSPIKE_WL, 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 868FFC22211; Fri, 11 Jan 2019 18:05:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 50D41C221BE; Fri, 11 Jan 2019 18:05:01 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lists.denx.de (Postfix) with ESMTPS id 111DBC2220A for ; Fri, 11 Jan 2019 18:04:58 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id w7so6601121pgp.13 for ; Fri, 11 Jan 2019 10:04:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eh4bxA/EgrcMVQBe2GDgSpxBMYlP820aEO644VUXnEM=; b=o/hhJLaabljQ/4pE2extG5AFQ8ZYgzh8fc1/2Ud+zN9E31ohRxsA/qbZegvwPjCTjF SkNU593NB8fRBf6msq35c+g7+q2EGjDIaC4cfVWFVx5SjAiFCXfeCV1ncwEqa8jnpjo/ bFjWDOn9gTXi3sBymrGaxu/Ri97cHUgQcxclo= 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=eh4bxA/EgrcMVQBe2GDgSpxBMYlP820aEO644VUXnEM=; b=rkJwMP6oYftWZhmLheLAaEJCEl7Ebn5dr1VqcWNYq860pv5qA/7AqFUFyvr7dBOWH6 DcW2ikQ426Uph7jZJQOJXQZRgRGvVEEltMVokQUwWtJiEh/MU+USY6kCTcIjr8GaJSv4 ZPM0wTF20NBXgEDgYFfsf2AJEijbOzWKGzFclP7MW1bhEURjXSHCNzjeA9lTsEqU62s+ PZXdPWW6Xy7dDjCYbpAj+7/nwzKfJmo03LfXr/XdV+dHFQDTEv4aEbrv/BiA8paZ6Giu aDt6Z0ybJPs8PeS+jrCUMgHg16pknmqq1RXR7NWsth3h1MIGQwj+vUDFriMHJxVII0ot ER3w== X-Gm-Message-State: AJcUukcAlzTRiFrcw8EjwQIzVoshUIIh/1MhzSz0wqEPEWcBZtXSMMz0 9ZI3kxibPHYpBMKG1Ticv2q+3Q== X-Google-Smtp-Source: ALg8bN7eQqT4MWxcxijdthtLPx+x97g27tL/v1pc/vt+loOl2f0AAQREG8MRMcNHVlvAw874CPS0cw== X-Received: by 2002:a62:5e41:: with SMTP id s62mr15369415pfb.232.1547229896645; Fri, 11 Jan 2019 10:04:56 -0800 (PST) Received: from localhost.localdomain ([49.206.202.55]) by smtp.gmail.com with ESMTPSA id 186sm156638146pga.36.2019.01.11.10.04.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 10:04:56 -0800 (PST) From: Jagan Teki To: Maxime Ripard , Andre Przywara , Chen-Yu Tsai , Simon Glass , Tom Rini , u-boot@lists.denx.de, linux-sunxi@googlegroups.com, Priit Laes , linux-amarula@amarulasolutions.com Date: Fri, 11 Jan 2019 23:34:13 +0530 Message-Id: <20190111180414.1563-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190111180414.1563-1-jagan@amarulasolutions.com> References: <20190111180414.1563-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 6/7] arm: sunxi: Enable DM_MMC 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" Enable DM_MMC for all Allwinner SoCs, this will eventually enable BLK. Also removed DM_MMC enablement in few parts of sunxi configurations. Signed-off-by: Jagan Teki --- arch/arm/Kconfig | 1 + arch/arm/mach-sunxi/Kconfig | 1 - configs/Linksprite_pcDuino3_defconfig | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 520ea8bed9..d5a35b2b5d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -850,6 +850,7 @@ config ARCH_SUNXI select DM_ETH select DM_GPIO select DM_KEYBOARD + select DM_MMC if MMC select DM_SERIAL select DM_USB if DISTRO_DEFAULTS select OF_BOARD_SETUP diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 3c54f5106d..74e234cded 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -154,7 +154,6 @@ config MACH_SUN4I bool "sun4i (Allwinner A10)" select CPU_V7A select ARM_CORTEX_CPU_IS_UP - select DM_MMC if MMC select DM_SCSI if SCSI select PHY_SUN4I_USB select DRAM_SUN4I diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig index 00a49d1077..56e8d5398e 100644 --- a/configs/Linksprite_pcDuino3_defconfig +++ b/configs/Linksprite_pcDuino3_defconfig @@ -14,7 +14,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3" CONFIG_SCSI_AHCI=y -CONFIG_DM_MMC=y CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_SUN7I_GMAC=y From patchwork Fri Jan 11 18:04:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1023720 X-Patchwork-Delegate: jagannadh.teki@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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="Hoyb1byl"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43brVB6FPCz9s9h for ; Sat, 12 Jan 2019 05:09:22 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7F010C22176; Fri, 11 Jan 2019 18:06:43 +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_H3, RCVD_IN_MSPIKE_WL, 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 325CAC221ED; Fri, 11 Jan 2019 18:05:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BEBE2C221F2; Fri, 11 Jan 2019 18:05:05 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by lists.denx.de (Postfix) with ESMTPS id 68AB0C2220F for ; Fri, 11 Jan 2019 18:05:01 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id a14so7074409plm.12 for ; Fri, 11 Jan 2019 10:05:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=etUP9Bz2q4/AKklF1ZPMOi9MSu11Uo0LEdOzTEhUGcI=; b=Hoyb1bylCexYfoveMiqH4ogWdwm1TMZNXDsL3k2ZrZaywdW9bInNfHuXIDL3810tra vBIj3BYVo6w6HV1dm5YQp0JZnT8v5iTJ3XZTvV5VGJAl1k2tYJltSOfKFbqoyXT6Dc7m StQ19NuEVO5OaIvFthGT52ezG5Hs0MXkcDaNA= 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=etUP9Bz2q4/AKklF1ZPMOi9MSu11Uo0LEdOzTEhUGcI=; b=Y7h2gRCicblCBIvUgZBzIB+W+vS+tj3PazE3R/GJXpdsqLNWGyM1JYknGUYkQOLThS uXB1M2sJRPPe0PP6+a2EW2qx409oXWGbc7RaXreh5R/cBKLuFaIFbORei4qKhtDWBan+ UpRNMa2HrE1p5mcaI6Pg2+PCrjKGt1cDwtgmsA5i2F4tCVvCcTg6ncB2hjWFFlRq9DBZ ooaj+Xz80Cobr//f8gi85wZ30ELUISzdhtN7GX2iQsKo2xc63fzHxiAfID/I1X2Zwwem mrfFF2YWDKr40gjqO54/q/+QUI3EAVjzMLoGJWA6zIsHkKbMlLmoQHL7UJsD1vN8kvFo Vfbw== X-Gm-Message-State: AJcUukecYam46SLyuIKTzMsR+O5w0HrAYbBUzd6iYRm5Bo939CDVPL0K vWea0Yz0ebwtz0J3Hk9tHpU95xtiV80= X-Google-Smtp-Source: ALg8bN4KXHYTRuGGikDjk/VRoL6Skjz/My4BAdB6MHQWKRmENigxupGNtNI6WuH2gNfOixRQH66R+Q== X-Received: by 2002:a17:902:4523:: with SMTP id m32mr15536899pld.53.1547229900020; Fri, 11 Jan 2019 10:05:00 -0800 (PST) Received: from localhost.localdomain ([49.206.202.55]) by smtp.gmail.com with ESMTPSA id 186sm156638146pga.36.2019.01.11.10.04.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 10:04:59 -0800 (PST) From: Jagan Teki To: Maxime Ripard , Andre Przywara , Chen-Yu Tsai , Simon Glass , Tom Rini , u-boot@lists.denx.de, linux-sunxi@googlegroups.com, Priit Laes , linux-amarula@amarulasolutions.com Date: Fri, 11 Jan 2019 23:34:14 +0530 Message-Id: <20190111180414.1563-8-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190111180414.1563-1-jagan@amarulasolutions.com> References: <20190111180414.1563-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 7/7] arm: dts: sunxi: Enumerate MMC2 as MMC1 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" Environment and fastboot MMC devices are configured based number of mmc slots defined on particular board in sunxi platform. If number of slots are not more than 1, it assigns 0 which usually mmc device on SD slot. With DM_MMC it is detected as 0 since mmc0 node always be an mmc device. If number of slots are more than 1, it assigns 1 which assumes 0 is mmc device and 1 is emmc device. But with DM_MMC there is chance of detecting emmc as device 2 since mmc1 is SDIO as per devicetree definition. So override mmc2 to mmc1 in sunxi dtsi, this will eventually detect mmc2 as mmc 1 device even if the board dts has mmc0, mmc1, mmc2. Some platforms like A20 has mmc0...mmc3, but there is no usecases now for enabling all mmc controllers in any of A20 board dts files. Signed-off-by: Jagan Teki --- arch/arm/dts/sunxi-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 8a9f2a6417..fdd4c80aa4 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -1,6 +1,10 @@ #include / { + aliases { + mmc1 = &mmc2; + }; + binman { filename = "u-boot-sunxi-with-spl.bin"; pad-byte = <0xff>;