From: Tom Warren <twarren.nvidia@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/4] Tegra114: Dalmore: Add SDIO3 pad config to pinctrl_config table
Date: Tue, 12 Mar 2013 09:17:09 -0700 [thread overview]
Message-ID: <1363105031-30296-3-git-send-email-twarren@nvidia.com> (raw)
In-Reply-To: <1363105031-30296-1-git-send-email-twarren@nvidia.com>
SDIO1 (the SD-card slot on Dalmore) needs to have its pads setup
before the MMC driver is added.
Signed-off-by: Tom Warren <twarren@nvidia.com>
---
arch/arm/include/asm/arch-tegra114/gp_padctrl.h | 7 +++++++
board/nvidia/dalmore/dalmore.c | 4 ++++
board/nvidia/dalmore/pinmux-config-dalmore.h | 2 ++
3 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/arch/arm/include/asm/arch-tegra114/gp_padctrl.h b/arch/arm/include/asm/arch-tegra114/gp_padctrl.h
index c538bdd..82c70cb 100644
--- a/arch/arm/include/asm/arch-tegra114/gp_padctrl.h
+++ b/arch/arm/include/asm/arch-tegra114/gp_padctrl.h
@@ -56,4 +56,11 @@ struct apb_misc_gp_ctlr {
u32 sdio1cfg; /* 0xEC: APB_MISC_GP_SDIO1CFGPADCTRL */
};
+/* SDMMC1/3 settings from section 27.5 of T114 TRM */
+#define SDIOCFG_DRVUP_SLWF 0
+#define SDIOCFG_DRVDN_SLWR 0
+#define SDIOCFG_DRVUP 0x24
+#define SDIOCFG_DRVDN 0x14
+#define SDIOCFG_HSM 1
+
#endif /* _TEGRA114_GP_PADCTRL_H_ */
diff --git a/board/nvidia/dalmore/dalmore.c b/board/nvidia/dalmore/dalmore.c
index 2020a5f..7449b5b 100644
--- a/board/nvidia/dalmore/dalmore.c
+++ b/board/nvidia/dalmore/dalmore.c
@@ -16,6 +16,7 @@
#include <common.h>
#include <asm/arch/pinmux.h>
+#include <asm/arch/gp_padctrl.h>
#include "pinmux-config-dalmore.h"
/*
@@ -32,4 +33,7 @@ void pinmux_init(void)
pinmux_config_table(unused_pins_lowpower,
ARRAY_SIZE(unused_pins_lowpower));
+
+ /* Initialize any non-default pad configs (APB_MISC_GP regs) */
+ padgrp_config_table(dalmore_padctrl, ARRAY_SIZE(dalmore_padctrl));
}
diff --git a/board/nvidia/dalmore/pinmux-config-dalmore.h b/board/nvidia/dalmore/pinmux-config-dalmore.h
index e6fe842..7af3f75 100644
--- a/board/nvidia/dalmore/pinmux-config-dalmore.h
+++ b/board/nvidia/dalmore/pinmux-config-dalmore.h
@@ -364,5 +364,7 @@ static struct pingroup_config tegra114_pinmux_set_nontristate[] = {
static struct padctrl_config dalmore_padctrl[] = {
/* (_padgrp, _slwf, _slwr, _drvup, _drvdn, _lpmd, _schmt, _hsm) */
+ DEFAULT_PADCFG(SDIO3, SDIOCFG_DRVUP_SLWF, SDIOCFG_DRVDN_SLWR, \
+ SDIOCFG_DRVUP, SDIOCFG_DRVDN, NONE, DISABLE, ENABLE),
};
#endif /* PINMUX_CONFIG_COMMON_H */
--
1.7.0.4
next prev parent reply other threads:[~2013-03-12 16:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-12 16:17 [U-Boot] [PATCH 0/4] Tegra114: MMC: Add MMC driver for T114/Dalmore Tom Warren
2013-03-12 16:17 ` [U-Boot] [PATCH 1/4] Tegra114: fdt: Add SDMMC (sdhci) nodes for T114 boards (Dalmore for now) Tom Warren
2013-03-12 16:17 ` Tom Warren [this message]
2013-03-12 17:52 ` [U-Boot] [PATCH 2/4] Tegra114: Dalmore: Add SDIO3 pad config to pinctrl_config table Stephen Warren
2013-03-12 17:59 ` Tom Warren
2013-03-12 16:17 ` [U-Boot] [PATCH 3/4] Tegra114: MMC: Add SD bus power-rail init routine Tom Warren
2013-03-12 17:54 ` Stephen Warren
2013-03-12 18:05 ` Tom Warren
2013-03-12 18:13 ` Stephen Warren
2013-03-12 16:17 ` [U-Boot] [PATCH 4/4] Tegra114: MMC: Enable DT MMC driver support for Tegra114 Dalmore boards Tom Warren
2013-03-12 17:56 ` Stephen Warren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363105031-30296-3-git-send-email-twarren@nvidia.com \
--to=twarren.nvidia@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox