summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2012-01-25 13:36:16 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 10:59:27 +0200
commit85b43afa6aaf27b9c41c71569f570788fa24c5b5 (patch)
treeefbb44bc68da4c5c45db89512b00bc4072d8e80f
parent24351c10c70d690058d6d8fae42ec70400e566d7 (diff)
pm: fsmc: Add clock and regulator for Snowball smsc911x ethernet driver
For fsmc clock the driver name is ignored (can be use by different driver). Add a v-fsmc consumer for vape regulator, for now only the Snowball smsc911x driver needs it. Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--arch/arm/mach-ux500/clock-db8500.c2
-rw-r--r--drivers/mfd/db8500-prcmu.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/clock-db8500.c b/arch/arm/mach-ux500/clock-db8500.c
index 3f42b454867..d157478cb1b 100644
--- a/arch/arm/mach-ux500/clock-db8500.c
+++ b/arch/arm/mach-ux500/clock-db8500.c
@@ -858,7 +858,7 @@ static struct clk_lookup u8500_clocks[] = {
CLK_LOOKUP(p2_pclk11, "gpioblock1", NULL),
/* PERIPH 3 */
- CLK_LOOKUP(p3_pclk0, "fsmc", NULL),
+ CLK_LOOKUP(p3_pclk0, NULL, "fsmc"),
CLK_LOOKUP(p3_i2c0_clk, "nmk-i2c.0", NULL),
CLK_LOOKUP(p3_sdi2_clk, "sdi2", NULL),
CLK_LOOKUP(p3_ske_clk, "ske", NULL),
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 6225d21d137..43585f50eae 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2735,6 +2735,7 @@ static struct regulator_consumer_supply db8500_vape_consumers[] = {
REGULATOR_SUPPLY("vcore", "uart2"),
REGULATOR_SUPPLY("v-ape", "nmk-ske-keypad.0"),
REGULATOR_SUPPLY("v-hsi", "ste_hsi.0"),
+ REGULATOR_SUPPLY("vddvario", "smsc911x.0"),
};
static struct regulator_consumer_supply db8500_vsmps2_consumers[] = {