summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-p1852-sdhci.c
diff options
context:
space:
mode:
authorMohit Kataria <mkataria@nvidia.com>2012-05-18 17:28:04 +0530
committerVarun Colbert <vcolbert@nvidia.com>2012-07-05 15:38:10 -0700
commite764753820cb723501692204d8d36c5103903a2c (patch)
tree0600fc0fe5941ce29756258d05461472a74bf95b /arch/arm/mach-tegra/board-p1852-sdhci.c
parent25033fb96283a8ba9018db9ec13b64ace8022101 (diff)
ARM: Tegra: p1852: changed pinmux settings
Pinmux updated as per the latest pinmux sheet. Bug 978870 Change-Id: I122439df3d043216f1c8c2c1a0a3c88e74d760ee Signed-off-by: Mohit Kataria <mkataria@nvidia.com> Reviewed-on: http://git-master/r/111573 (cherry picked from commit 4e65d7d21b5ac5b25e3563ce6a7eb50cf1d8128d) Reviewed-on: http://git-master/r/103340 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-p1852-sdhci.c')
-rw-r--r--arch/arm/mach-tegra/board-p1852-sdhci.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/arch/arm/mach-tegra/board-p1852-sdhci.c b/arch/arm/mach-tegra/board-p1852-sdhci.c
index c1aa066ae1b0..17fb451e27c5 100644
--- a/arch/arm/mach-tegra/board-p1852-sdhci.c
+++ b/arch/arm/mach-tegra/board-p1852-sdhci.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2010 Google, Inc.
*
- * Copyright (C) 2012 NVIDIA Corporation
+ * Copyright (c) 2012, NVIDIA Corporation. All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -35,9 +35,11 @@
#include "board-p1852.h"
#include "devices.h"
+#define P1852_SD1_CD TEGRA_GPIO_PV2
+
static struct tegra_sdhci_platform_data tegra_sdhci_platform_data1 = {
- .cd_gpio = TEGRA_GPIO_PV2,
- .wp_gpio = TEGRA_GPIO_PD3,
+ .cd_gpio = P1852_SD1_CD,
+ .wp_gpio = -1,
.power_gpio = -1,
.is_8bit = false,
};
@@ -49,13 +51,6 @@ static struct tegra_sdhci_platform_data tegra_sdhci_platform_data2 = {
.is_8bit = true,
};
-static struct tegra_sdhci_platform_data tegra_sdhci_platform_data3 = {
- .cd_gpio = TEGRA_GPIO_PV3,
- .wp_gpio = TEGRA_GPIO_PD4,
- .power_gpio = -1,
- .is_8bit = false,
-};
-
static struct tegra_sdhci_platform_data tegra_sdhci_platform_data4 = {
.cd_gpio = -1,
.wp_gpio = -1,
@@ -67,12 +62,10 @@ int __init p1852_sdhci_init(void)
{
tegra_sdhci_device1.dev.platform_data = &tegra_sdhci_platform_data1;
tegra_sdhci_device2.dev.platform_data = &tegra_sdhci_platform_data2;
- tegra_sdhci_device3.dev.platform_data = &tegra_sdhci_platform_data3;
tegra_sdhci_device4.dev.platform_data = &tegra_sdhci_platform_data4;
platform_device_register(&tegra_sdhci_device1);
platform_device_register(&tegra_sdhci_device2);
- platform_device_register(&tegra_sdhci_device3);
platform_device_register(&tegra_sdhci_device4);
return 0;