summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-04-18 17:43:23 +0200
committerDominik Sliwa <dominik.sliwa@toradex.com>2018-06-19 16:30:17 +0200
commit4d969d3357c16d71097b4a2b1a4076a2132e6057 (patch)
treebfc61522489aa1ae7e02a5602eb24d385ea61e55
parentb63ee2039e292ee00d3f5650ae29eaa2c67e3b09 (diff)
apalis/colibri_t20/t30: pull-up sd card detect pins
In order to avoid any floating SD card detect pins as may e.g. happen on Ixora V1.1A pull them all up. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com>
-rw-r--r--arch/arm/mach-tegra/board-apalis_t30-pinmux.c4
-rw-r--r--arch/arm/mach-tegra/board-colibri_t20-pinmux.c2
-rw-r--r--arch/arm/mach-tegra/board-colibri_t30-pinmux.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-apalis_t30-pinmux.c b/arch/arm/mach-tegra/board-apalis_t30-pinmux.c
index 6bcdbd112586..ae5e82fbedd5 100644
--- a/arch/arm/mach-tegra/board-apalis_t30-pinmux.c
+++ b/arch/arm/mach-tegra/board-apalis_t30-pinmux.c
@@ -139,7 +139,7 @@ static __initdata struct tegra_pingroup_config apalis_t30_pinmux[] = {
DEFAULT_PINMUX(CLK1_REQ, HDA, NORMAL, NORMAL, OUTPUT),
DEFAULT_PINMUX(CLK2_OUT, EXTPERIPH2, NORMAL, NORMAL, INPUT),
- DEFAULT_PINMUX(CLK2_REQ, RSVD1, NORMAL, NORMAL, INPUT),
+ DEFAULT_PINMUX(CLK2_REQ, RSVD1, PULL_UP, NORMAL, INPUT),
DEFAULT_PINMUX(CLK3_OUT, RSVD1, PULL_DOWN, TRISTATE, OUTPUT), /* NC */
DEFAULT_PINMUX(CLK3_REQ, RSVD1, PULL_DOWN, TRISTATE, OUTPUT), /* NC */
@@ -245,7 +245,7 @@ static __initdata struct tegra_pingroup_config apalis_t30_pinmux[] = {
#ifdef IXORA
DEFAULT_PINMUX(GPIO_PV3, RSVD1, NORMAL, NORMAL, OUTPUT), /* UART2_3_RS232_FOFF_N */
#else
- DEFAULT_PINMUX(GPIO_PV3, RSVD1, NORMAL, NORMAL, INPUT),
+ DEFAULT_PINMUX(GPIO_PV3, RSVD1, PULL_UP, NORMAL, INPUT),
#endif
DEFAULT_PINMUX(HDMI_CEC, CEC, NORMAL, NORMAL, INPUT),
diff --git a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c
index 4739f1ede095..5e793600d2b5 100644
--- a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c
+++ b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c
@@ -175,7 +175,7 @@ static __initdata struct tegra_pingroup_config colibri_t20_pinmux[] = {
#endif
{TEGRA_PINGROUP_GMA, TEGRA_MUX_SDIO4, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL},
/* MM_CD */
- {TEGRA_PINGROUP_GMB, TEGRA_MUX_GMI_INT, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL},
+ {TEGRA_PINGROUP_GMB, TEGRA_MUX_GMI_INT, TEGRA_PUPD_PULL_UP, TEGRA_TRI_NORMAL},
/* BT_TXD, BT_RXD, BT_CTS and BT_RTS, GPIO K7 */
{TEGRA_PINGROUP_GMC, TEGRA_MUX_UARTD, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL},
{TEGRA_PINGROUP_GMD, TEGRA_MUX_RSVD, TEGRA_PUPD_NORMAL, TEGRA_TRI_NORMAL},
diff --git a/arch/arm/mach-tegra/board-colibri_t30-pinmux.c b/arch/arm/mach-tegra/board-colibri_t30-pinmux.c
index 269ab24ba8b5..1dac02940331 100644
--- a/arch/arm/mach-tegra/board-colibri_t30-pinmux.c
+++ b/arch/arm/mach-tegra/board-colibri_t30-pinmux.c
@@ -274,7 +274,7 @@ static __initdata struct tegra_pingroup_config colibri_t30_pinmux[] = {
//multiplexed GMI_IORDY
DEFAULT_PINMUX(GMI_WAIT, GMI, NORMAL, TRISTATE, OUTPUT),
//GPIO PU6: MMC_CD
- DEFAULT_PINMUX(GMI_WP_N, RSVD1, NORMAL, NORMAL, INPUT),
+ DEFAULT_PINMUX(GMI_WP_N, RSVD1, PULL_UP, NORMAL, INPUT),
//gated, multiplexed LCD_CS1_N or LCD_WR_N
DEFAULT_PINMUX(GMI_WR_N, GMI, NORMAL, NORMAL, INPUT),
#endif /* COLIBRI_T30_V10 */