summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2013-12-19 19:17:01 +0530
committerThomas Cherry <tcherry@nvidia.com>2013-12-19 10:48:09 -0800
commit69e09e5ee0ce9dfd312030e7589fc872190b460f (patch)
tree1006294a6175b2b8a3debbbfc30e316ee86d1544 /arch/arm
parent20d6c3d53e05c4d270533dcc5281c59d8a3cccdd (diff)
ARM: tegra: fix sdmmc2-sdslot regulator configuration
THe SDMMC2 sd card slot power is provided through Tegra GPIO PR0 which is not open drain type. Removing this flag from the regulator registration. bug 1418136 Change-Id: Ic948c4e422fbc5262805f2df60527cec8313e2a0 Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/347556 GVS: Gerrit_Virtual_Submit Reviewed-by: Andrew Tran <atran@nvidia.com> Tested-by: Andrew Tran <atran@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1936-fixed.dtsi3
-rw-r--r--arch/arm/mach-tegra/board-ardbeg-sdhci.c4
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1936-fixed.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1936-fixed.dtsi
index b21aa510e93a..8f82ed8a7d97 100644
--- a/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1936-fixed.dtsi
+++ b/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1936-fixed.dtsi
@@ -47,9 +47,8 @@
regulator-name = "vddio_sd";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- gpio = <&gpio TEGRA_GPIO(R, 0) 0>;
+ gpio = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
enable-active-high;
- gpio-open-drain;
vin-supply = <&palmas_smps9>;
consumers {
diff --git a/arch/arm/mach-tegra/board-ardbeg-sdhci.c b/arch/arm/mach-tegra/board-ardbeg-sdhci.c
index 21e07867d423..35d84a87f9b7 100644
--- a/arch/arm/mach-tegra/board-ardbeg-sdhci.c
+++ b/arch/arm/mach-tegra/board-ardbeg-sdhci.c
@@ -443,10 +443,6 @@ int __init ardbeg_sdhci_init(void)
board_info.board_id == BOARD_PM359)
tegra_sdhci_platform_data0.disable_clock_gate = 1;
- if (board_info.board_id == BOARD_P1761) {
- tegra_sdhci_platform_data2.power_gpio = TEGRA_GPIO_PR0;
- }
-
platform_device_register(&tegra_sdhci_device3);
platform_device_register(&tegra_sdhci_device2);
platform_device_register(&tegra_sdhci_device0);