aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Menon2013-03-26 00:20:56 -0500
committerTom Rini2013-05-10 07:25:55 -0500
commit384bcae013c78e020e9a04df4c7cc3b451a68811 (patch)
treea302aa5a4026d4472220a3899a95a060ae865a81
parent12733881e94018f9a9b0cdb72c7ab55638142220 (diff)
downloadu-boot-384bcae013c78e020e9a04df4c7cc3b451a68811.tar.gz
u-boot-384bcae013c78e020e9a04df4c7cc3b451a68811.tar.xz
u-boot-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>
-rw-r--r--drivers/mmc/omap_hsmmc.c2
-rw-r--r--drivers/power/palmas.c2
-rw-r--r--include/palmas.h2
3 files changed, 3 insertions, 3 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)
117 value |= SDCARD_BIAS_HIZ_MODE; 117 value |= SDCARD_BIAS_HIZ_MODE;
118 writel(value, (*ctrl)->control_pbias); 118 writel(value, (*ctrl)->control_pbias);
119 119
120 twl6035_mmc1_poweron_ldo(); 120 palmas_mmc1_poweron_ldo();
121 121
122 value = readl((*ctrl)->control_pbias); 122 value = readl((*ctrl)->control_pbias);
123 value &= ~SDCARD_BIAS_HIZ_MODE; 123 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)
50 return; 50 return;
51} 51}
52 52
53int twl6035_mmc1_poweron_ldo(void) 53int palmas_mmc1_poweron_ldo(void)
54{ 54{
55 u8 val = 0; 55 u8 val = 0;
56 56
diff --git a/include/palmas.h b/include/palmas.h
index 6618aad491..305092e1ce 100644
--- a/include/palmas.h
+++ b/include/palmas.h
@@ -39,4 +39,4 @@
39int twl6035_i2c_write_u8(u8 chip_no, u8 val, u8 reg); 39int twl6035_i2c_write_u8(u8 chip_no, u8 val, u8 reg);
40int twl6035_i2c_read_u8(u8 chip_no, u8 *val, u8 reg); 40int twl6035_i2c_read_u8(u8 chip_no, u8 *val, u8 reg);
41void palmas_init_settings(void); 41void palmas_init_settings(void);
42int twl6035_mmc1_poweron_ldo(void); 42int palmas_mmc1_poweron_ldo(void);