summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2013-03-26 05:20:56 +0000
committerTom Rini <trini@ti.com>2013-05-10 08:25:55 -0400
commit384bcae013c78e020e9a04df4c7cc3b451a68811 (patch)
treea302aa5a4026d4472220a3899a95a060ae865a81 /drivers
parent12733881e94018f9a9b0cdb72c7ab55638142220 (diff)
downloadtalos-obmc-uboot-384bcae013c78e020e9a04df4c7cc3b451a68811.tar.gz
talos-obmc-uboot-384bcae013c78e020e9a04df4c7cc3b451a68811.zip
palmas: rename twl6035_mmc1_poweron_ldo with an palmas generic function
Since TPS659038/TWL6035/TWL6037 all belong to palmas family of TI PMICs, rename twl6035_mmc1_poweron_ldo by a more generic palmas_mmc1_poweron_ldo function. Signed-off-by: Nishanth Menon <nm@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/omap_hsmmc.c2
-rw-r--r--drivers/power/palmas.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index b39db9e32f..afdfa886e8 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -117,7 +117,7 @@ static void omap5_pbias_config(struct mmc *mmc)
value |= SDCARD_BIAS_HIZ_MODE;
writel(value, (*ctrl)->control_pbias);
- twl6035_mmc1_poweron_ldo();
+ palmas_mmc1_poweron_ldo();
value = readl((*ctrl)->control_pbias);
value &= ~SDCARD_BIAS_HIZ_MODE;
diff --git a/drivers/power/palmas.c b/drivers/power/palmas.c
index bf36a19aa1..489a7a9fe2 100644
--- a/drivers/power/palmas.c
+++ b/drivers/power/palmas.c
@@ -50,7 +50,7 @@ void palmas_init_settings(void)
return;
}
-int twl6035_mmc1_poweron_ldo(void)
+int palmas_mmc1_poweron_ldo(void)
{
u8 val = 0;
OpenPOWER on IntegriCloud