summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJin Park <jinyoungp@nvidia.com>2011-10-06 16:20:47 +0900
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:50:10 -0800
commitd2a6b04923dbde55389dacc580479de6c1ea514e (patch)
tree18556ba46e3945a462c599f7b766a467067cfda6 /arch
parent3b194497f996c5c6c25c183cf76c4fbd291ba32c (diff)
arm: tegra: cardhu: pm298: Fix SDMMC regulator registration
Use the device driver name instead of encoding the SDMMC controller in the regulator supply name. This change is came from commit 676dd57f8eb252ce61807c02e5153b4ee4e29418, and it was reviewd on http://git-master/r/#change,53783. Reviewed-on: http://git-master/r/56368 (cherry picked from commit 03aa6082f7db7006de6e9c357fcf04e0d395fb16) Signed-off-by: Jin Park <jinyoungp@nvidia.com> Change-Id: If80057e52feb29598e2b6bff2e729277f7828531 Reviewed-on: http://git-master/r/65065 Tested-by: Jinyoung Park <jinyoungp@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Rebase-Id: Rdb7c61e477e59a56237e0ea89c37848552842323
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c b/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c
index eb51e4e26ba6..a3c3b542401b 100644
--- a/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c
+++ b/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c
@@ -76,7 +76,7 @@ static struct regulator_consumer_supply max77663_sd2_supply[] = {
REGULATOR_SUPPLY("ldo8", NULL),
REGULATOR_SUPPLY("vcore_audio", NULL),
REGULATOR_SUPPLY("avcore_audio", NULL),
- REGULATOR_SUPPLY("vddio_sdmmc3", NULL),
+ REGULATOR_SUPPLY("vddio_sdmmc", "sdhci-tegra.2"),
REGULATOR_SUPPLY("pwrdet_sdmmc3", NULL),
REGULATOR_SUPPLY("vcore1_lpddr2", NULL),
REGULATOR_SUPPLY("vcom_1v8", NULL),
@@ -119,7 +119,7 @@ static struct regulator_consumer_supply max77663_ldo2_supply[] = {
};
static struct regulator_consumer_supply max77663_ldo3_supply[] = {
- REGULATOR_SUPPLY("vddio_sdmmc4", NULL),
+ REGULATOR_SUPPLY("vddio_sdmmc", "sdhci-tegra.3"),
REGULATOR_SUPPLY("pwrdet_sdmmc4", NULL),
};
@@ -128,7 +128,7 @@ static struct regulator_consumer_supply max77663_ldo4_supply[] = {
};
static struct regulator_consumer_supply max77663_ldo5_supply[] = {
- REGULATOR_SUPPLY("vddio_sdmmc1", NULL),
+ REGULATOR_SUPPLY("vddio_sdmmc", "sdhci-tegra.0"),
REGULATOR_SUPPLY("pwrdet_sdmmc1", NULL),
};
@@ -512,7 +512,7 @@ static int gpio_switch_en_vdd_com_voltages[] = { 3300};
/* EN_VDD_SDMMC1 from AP GPIO VI_HSYNC D07*/
static struct regulator_consumer_supply gpio_switch_en_vdd_sdmmc1_supply[] = {
- REGULATOR_SUPPLY("vddio_sd_slot", NULL),
+ REGULATOR_SUPPLY("vddio_sd_slot", "sdhci-tegra.0"),
};
static int gpio_switch_en_vdd_sdmmc1_voltages[] = { 3300};