diff options
| author | Minsu Kim <minsu78.kim@samsung.com> | 2010-09-11 13:43:38 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2011-11-17 17:45:33 -0800 |
| commit | 4f51aee2cceae31f080a0c2400d8fce41c5a670a (patch) | |
| tree | e9ee40568c034e4c0703c5c1fbb389ad2455b9de | |
| parent | e9a1ee99d244211bc17445f7a6033a60afc9be34 (diff) | |
| download | kernel_samsung_crespo-4f51aee2cceae31f080a0c2400d8fce41c5a670a.zip kernel_samsung_crespo-4f51aee2cceae31f080a0c2400d8fce41c5a670a.tar.gz kernel_samsung_crespo-4f51aee2cceae31f080a0c2400d8fce41c5a670a.tar.bz2 | |
S5PC11X: PM: change structure name for mainline max8998 code
from max8998_subdev_data to max8998_regulator_data
Change-Id: I817874933f101f2e3e071f9d734224b19192e67e
Signed-off-by: Minsu Kim <minsu78.kim@samsung.com>
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-herring.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c index 8d6c0b0..f4ab73f 100644 --- a/arch/arm/mach-s5pv210/mach-herring.c +++ b/arch/arm/mach-s5pv210/mach-herring.c @@ -18,7 +18,7 @@ #include <linux/i2c.h> #include <linux/i2c-gpio.h> #include <linux/regulator/consumer.h> -#include <linux/regulator/max8998.h> +#include <linux/mfd/max8998.h> #include <linux/i2c/qt602240_ts.h> #include <linux/clk.h> #include <linux/delay.h> @@ -532,7 +532,7 @@ static struct regulator_init_data herring_buck4_data = { .consumer_supplies = buck4_consumer, }; -static struct max8998_subdev_data herring_regulators[] = { +static struct max8998_regulator_data herring_regulators[] = { { MAX8998_LDO2, &herring_ldo2_data }, { MAX8998_LDO3, &herring_ldo3_data }, { MAX8998_LDO4, &herring_ldo4_data }, @@ -557,19 +557,6 @@ static struct max8998_subdev_data herring_regulators[] = { static struct max8998_platform_data herring_platform_data = { .num_regulators = ARRAY_SIZE(herring_regulators), .regulators = herring_regulators, - - .set1 = GPIO_BUCK_1_EN_A, - .set2 = GPIO_BUCK_1_EN_B, - .set3 = GPIO_BUCK_2_EN, - .dvsarm1 = 0x14, /* 1.25v */ - .dvsarm2 = 0x12, /* 1.20V */ - .dvsarm3 = 0x0c, /* 1.05V */ - .dvsarm4 = 0x08, /* 0.95V */ - .dvsarm5 = 0x00, - - .dvsint1 = 0x0e, /* 1.10v */ - .dvsint2 = 0x0a, /* 1.00V */ - .dvsint3 = 0x00, }; #endif |