From 384bcae013c78e020e9a04df4c7cc3b451a68811 Mon Sep 17 00:00:00 2001
From: Nishanth Menon <nm@ti.com>
Date: Tue, 26 Mar 2013 05:20:56 +0000
Subject: [PATCH] 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>
---
drivers/mmc/omap_hsmmc.c | 2 +-
drivers/power/palmas.c | 2 +-
include/palmas.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index b39db9e32fe..afdfa886e8a 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 bf36a19aa1e..489a7a9fe29 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;
diff --git a/include/palmas.h b/include/palmas.h
index 6618aad4916..305092e1cee 100644
--- a/include/palmas.h
+++ b/include/palmas.h
@@ -39,4 +39,4 @@
int twl6035_i2c_write_u8(u8 chip_no, u8 val, u8 reg);
int twl6035_i2c_read_u8(u8 chip_no, u8 *val, u8 reg);
void palmas_init_settings(void);
-int twl6035_mmc1_poweron_ldo(void);
+int palmas_mmc1_poweron_ldo(void);
--
GitLab