diff options
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-regulators.c | 11 | ||||
| -rw-r--r-- | drivers/regulator/ab5500.c | 24 | ||||
| -rw-r--r-- | include/linux/regulator/ab5500.h | 1 |
3 files changed, 0 insertions, 36 deletions
diff --git a/arch/arm/mach-ux500/board-u5500-regulators.c b/arch/arm/mach-ux500/board-u5500-regulators.c index 191c131ca14..b5454b46d32 100644 --- a/arch/arm/mach-ux500/board-u5500-regulators.c +++ b/arch/arm/mach-ux500/board-u5500-regulators.c @@ -16,9 +16,6 @@ * AB5500 */ -static struct regulator_consumer_supply ab5500_ldo_d_consumers[] = { -}; - static struct regulator_consumer_supply ab5500_ldo_g_consumers[] = { REGULATOR_SUPPLY("v-MMC-SD", "sdi1"), }; @@ -52,14 +49,6 @@ static struct regulator_consumer_supply ab5500_ldo_sim_consumers[] = { static struct regulator_init_data ab5500_regulator_init_data[AB5500_NUM_REGULATORS] = { - /* AB internal analog */ - [AB5500_LDO_D] = { - .constraints = { - .valid_ops_mask = REGULATOR_CHANGE_STATUS, - }, - .consumer_supplies = ab5500_ldo_d_consumers, - .num_consumer_supplies = ARRAY_SIZE(ab5500_ldo_d_consumers), - }, /* SD Card */ [AB5500_LDO_G] = { .constraints = { diff --git a/drivers/regulator/ab5500.c b/drivers/regulator/ab5500.c index fc37c0371e1..2c43526f08a 100644 --- a/drivers/regulator/ab5500.c +++ b/drivers/regulator/ab5500.c @@ -24,10 +24,6 @@ #define AB5500_LDO_S_PWR1 0x67 #define AB5500_LDO_S_PWR0 0x68 -#define AB5500_LDO_D_ST 0x72 -#define AB5500_LDO_D_PWR1 0x73 -#define AB5500_LDO_D_PWR0 0x74 - #define AB5500_LDO_G_ST 0x78 #define AB5500_LDO_G_PWR1 0x79 #define AB5500_LDO_G_PWR0 0x7a @@ -324,10 +320,6 @@ static const int ab5500_ldo_s_voltages[] = { [0x07] = 2790000, }; -static const int ab5500_ldo_d_voltages[] = { - [0x00] = 2100000, -}; - static const int ab5500_ldo_lg_voltages[] = { [0x00] = 1200000, [0x01] = 0, /* not used */ @@ -377,22 +369,6 @@ static struct ab5500_regulator ab5500_regulators[] = { .pwrctrl = true, .mode = AB5500_LDO_MODE_FULLPOWER, }, - [AB5500_LDO_D] = { - .desc = { - .name = "LDO_D", - .id = AB5500_LDO_D, - .ops = &ab5500_regulator_fixed_ops, - .type = REGULATOR_VOLTAGE, - .owner = THIS_MODULE, - .n_voltages = ARRAY_SIZE(ab5500_ldo_d_voltages), - }, - .bank = AB5500_BANK_STARTUP, - .reg = AB5500_LDO_D_ST, - .voltages = ab5500_ldo_d_voltages, - .enable_time = 400, - .pwrctrl = true, - .mode = AB5500_LDO_MODE_FULLPOWER, - }, [AB5500_LDO_L] = { .desc = { .name = "LDO_L", diff --git a/include/linux/regulator/ab5500.h b/include/linux/regulator/ab5500.h index 909b41b8598..d3c88ebf3a2 100644 --- a/include/linux/regulator/ab5500.h +++ b/include/linux/regulator/ab5500.h @@ -8,7 +8,6 @@ #define __LINUX_REGULATOR_AB5500_H enum ab5500_regulator_id { - AB5500_LDO_D, AB5500_LDO_G, AB5500_LDO_H, AB5500_LDO_K, |