summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJin Park <jinyoungp@nvidia.com>2011-10-06 16:20:47 +0900
committerSimone Willett <swillett@nvidia.com>2011-10-11 16:56:29 -0700
commit03aa6082f7db7006de6e9c357fcf04e0d395fb16 (patch)
treeea659edb8a4ab0309f38369fbf939846a9ff42b1
parentb30687a50bb2bf520d71e02339d01481c2d418bd (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. Change-Id: I7d5a21b898fddf6892f12ba01dc2e6c987926ff1 Signed-off-by: Jin Park <jinyoungp@nvidia.com> Reviewed-on: http://git-master/r/56368 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
-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 95fb00bf1c14..145449fa2330 100644
--- a/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c
+++ b/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c
@@ -77,7 +77,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),
@@ -120,7 +120,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),
};
@@ -129,7 +129,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),
};
@@ -513,7 +513,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};